diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-27 14:59:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-27 14:59:28 -0700 |
| commit | 96abb48dff22a54de4ddcdd427d8e5a261d0facc (patch) | |
| tree | 887a3077b2133f1f066e21a95bd2902f6f1a2787 | |
| parent | e3e8642ce41278cf7b76424faf4c3fb69ca91e4d (diff) | |
| parent | aa93bcd62482719c146a411008e1eac94135b6a4 (diff) | |
| download | frameworks_base-96abb48dff22a54de4ddcdd427d8e5a261d0facc.zip frameworks_base-96abb48dff22a54de4ddcdd427d8e5a261d0facc.tar.gz frameworks_base-96abb48dff22a54de4ddcdd427d8e5a261d0facc.tar.bz2 | |
am aa93bcd6: Fix issue #3138926: App\'s preferences can be lost after onPause()
| -rw-r--r-- | core/java/android/app/Activity.java | 1 | ||||
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
2 files changed, 3 insertions, 1 deletions
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); |