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

Commit dad62b9f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

parents 9f4c4ee6 bef8a3e3

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

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



        if (mode == FINISH_IMMEDIATELY

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

                || prevState == ActivityState.STOPPED

                || prevState == ActivityState.INITIALIZING) {

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