From aa93bcd62482719c146a411008e1eac94135b6a4 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 27 Oct 2010 13:57:00 -0700 Subject: Fix issue #3138926: App's preferences can be lost after onPause() Change-Id: Icea3d37fab5e47c89c5cbc0adff7bbec898fa93e --- core/java/android/app/Activity.java | 1 - core/java/android/app/ActivityThread.java | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 78a77eb..f25c4c3 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1162,7 +1162,6 @@ public class Activity extends ContextThemeWrapper */ protected void onPause() { mCalled = true; - QueuedWork.waitToFinish(); } /** diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 63a5ff6..78df780 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -2265,6 +2265,9 @@ public final class ActivityThread { r.activity.mConfigChangeFlags |= configChanges; Bundle state = performPauseActivity(token, finished, true); + // Make sure any pending writes are now committed. + QueuedWork.waitToFinish(); + // Tell the activity manager we have paused. try { ActivityManagerNative.getDefault().activityPaused(token, state); -- cgit v1.1