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

Commit b4fcd868 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by The Android Automerger
Browse files

Revert "Finish already paused activity if it should be finished after pausing" 

This reverts commit bef8a3e3.

Changed caused some existing apps to crash. Reverting to unblock the
build while I investigate.

Bug: 22170595
Bug: 22397812
parent 1693c731

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