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

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

Finish already paused activity if it should be finished after pausing 

If the app requests its activity to be finished allow it to be finished
immediately if the activity is already paused.

Bug: 22170595
Change-Id: I1ecc0d5f3b85fd80cbe8cdc1d4e32d5c6a50b20c
parent 32c4802a

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -2963,6 +2963,7 @@ final class ActivityStack { 
        r.state = ActivityState.FINISHING;

        r.state = ActivityState.FINISHING;





        if (mode == FINISH_IMMEDIATELY

        if (mode == FINISH_IMMEDIATELY

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

                || prevState == ActivityState.STOPPED

                || prevState == ActivityState.STOPPED

                || prevState == ActivityState.INITIALIZING) {

                || prevState == ActivityState.INITIALIZING) {

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

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