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

Commit 2fec9051 authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Finish stopping activities if requested 

If activity was in process of becoming invisible and it needed to be
finished, we weren't actually finishing it if we tried to do it while
in STOPPING state. This lead to activity being removed from stopping
list and stuck in FINISHING state.

Bug: 34195099
Test: android.server.cts.ActivityManagerActivityVisibilityTests
Test: #testFinishActivityWithMoveTaskToBackAfterPause
Test: #testFinishActivityWithMoveTaskToBackAfterStop
Change-Id: Ic892f998b7fda7d5ede9a84b1ab837dbef40af21
parent 9f5d2b08

services/core/java/com/android/server/am/ActivityStack.java

+1 −0
Original line number Diff line number Diff line
@@ -3584,6 +3584,7 @@ final class ActivityStack extends ConfigurationContainer implements StackWindowL 
                || (prevState == ActivityState.PAUSED

                    && (mode == FINISH_AFTER_PAUSE || mStackId == PINNED_STACK_ID))

                || finishingActivityInNonFocusedStack

                || prevState == ActivityState.STOPPING

                || prevState == ActivityState.STOPPED

                || prevState == ActivityState.INITIALIZING) {

            r.makeFinishingLocked();