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

Commit ae30f308 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Allow pinned activities to finish immediately 

Pinned activities are normally in the paused state so when finishing
they can finish immediately as there might not be additional transition
in the system to finish them.

Bug: 28434641
Bug: 28350881
Change-Id: I5f1eaf0969a7eb08292cb9cc123bf8c0fddc9ea8
parent f4810f55

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) {