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

Commit 64ca2706 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow pinned activities to finish immediately" into nyc-dev

parents 180aa65e ae30f308

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

+2 −3
Original line number Diff line number Diff line
@@ -3488,11 +3488,10 @@ final class ActivityStack { 
        r.state = ActivityState.FINISHING;



        if (mode == FINISH_IMMEDIATELY

                || (mode == FINISH_AFTER_PAUSE && prevState == ActivityState.PAUSED)

                || (prevState == ActivityState.PAUSED

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

                || prevState == ActivityState.STOPPED

                || prevState == ActivityState.INITIALIZING) {

            // If this activity is already stopped, we can just finish

            // it right now.

            r.makeFinishingLocked();

            boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm");

            if (activityRemoved) {