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

Commit 57d93756 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Avoid activity stopped when relaunching it to resumed" into sc-dev am:... 

Merge "Avoid activity stopped when relaunching it to resumed" into sc-dev am: 09c06548 am: 2c1ca5d8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934424

Change-Id: I41ccbcbc6c148c9bba5007bd665c0d73757b1ec4
parents cb80df25 2c1ca5d8

services/core/java/com/android/server/wm/ActivityRecord.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -8206,6 +8206,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            setState(PAUSED, "relaunchActivityLocked");

            setState(PAUSED, "relaunchActivityLocked");

        }

        }





        // The activity may be waiting for stop, but that is no longer appropriate for it.

        mTaskSupervisor.mStoppingActivities.remove(this);



        configChangeFlags = 0;

        configChangeFlags = 0;

        deferRelaunchUntilPaused = false;

        deferRelaunchUntilPaused = false;

        preserveWindowOnDeferredRelaunch = false;

        preserveWindowOnDeferredRelaunch = false;