commit aa93bcd62482719c146a411008e1eac94135b6a4
author Dianne Hackborn <hackbod@google.com> Wed Oct 27 13:57:00 2010 -0700
committer Dianne Hackborn <hackbod@google.com> Wed Oct 27 13:57:00 2010 -0700
tree 258263a8b17ea3b9e401655243d2888dbe1d5b81
parent 001c7d1281b999f1ebfff8cb0d18773d6d9e1e74

Fix issue #3138926: App's preferences can be lost after onPause()

Change-Id: Icea3d37fab5e47c89c5cbc0adff7bbec898fa93e

core/java/android/app/Activity.java

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 @@
      */
     protected void onPause() {
         mCalled = true;
-        QueuedWork.waitToFinish();
     }
 
     /**

core/java/android/app/ActivityThread.java

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 @@
             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);