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

Commit e71df8fa authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 96abb48d: am aa93bcd6: Fix issue #3138926: App\'s preferences can be lost after onPause()

parents e0b4b869 96abb48d

core/java/android/app/Activity.java

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

    protected void onPause() {

        mCalled = true;

        QueuedWork.waitToFinish();

    }



    /**

core/java/android/app/ActivityThread.java

+3 −0
Original line number Diff line number Diff line
@@ -2347,6 +2347,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);