Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa93bcd6 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

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

Change-Id: Icea3d37fab5e47c89c5cbc0adff7bbec898fa93e
parent 001c7d12

core/java/android/app/Activity.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -1162,7 +1162,6 @@ public class Activity extends ContextThemeWrapper 
     */

     */

    protected void onPause() {

    protected void onPause() {

        mCalled = true;

        mCalled = true;

        QueuedWork.waitToFinish();

    }

    }





    /**

    /**

core/java/android/app/ActivityThread.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -2265,6 +2265,9 @@ public final class ActivityThread { 
            r.activity.mConfigChangeFlags |= configChanges;

            r.activity.mConfigChangeFlags |= configChanges;

            Bundle state = performPauseActivity(token, finished, true);

            Bundle state = performPauseActivity(token, finished, true);





            // Make sure any pending writes are now committed.

            QueuedWork.waitToFinish();

            

            // Tell the activity manager we have paused.

            // Tell the activity manager we have paused.

            try {

            try {

                ActivityManagerNative.getDefault().activityPaused(token, state);

                ActivityManagerNative.getDefault().activityPaused(token, state);