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

Commit 18ee2ee9 authored by Louis Chang's avatar Louis Chang
Browse files

Avoid activity stopped when relaunching it to resumed 

The activity could still in the stopping list while
relaunching it to resume state, which may cause the
activity to be stopped afterward.

Bug: 189413973
Test: wm presubmit
Change-Id: Ib77fe682f66504332fda82793b0d6e5a430f8c9d
parent aa12b6a4

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

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