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

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

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

parents 8657d9e8 12bb9568

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

+0 −1
Original line number Diff line number Diff line
@@ -2963,7 +2963,6 @@ 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