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

Commit 026d0b22 authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge "Finish stopping activities if requested"

parents 3265821c 2fec9051

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();