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

Commit fee88fdb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android code review
Browse files

Merge "Issue: Foreground activity performs [Resume] and [Pause] when any... 

Merge "Issue: Foreground activity performs [Resume] and [Pause] when any process died in sleep mode."
parents 50b53700 dbad287b

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

100644 → 100755
+4 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,10 @@ final class ActivityStack { 
        // If we are sleeping, and there is no resumed activity, and the top

        // activity is paused, well that is the state we want.

        if ((mService.mSleeping || mService.mShuttingDown)

                && mLastPausedActivity == next && next.state == ActivityState.PAUSED) {

                && mLastPausedActivity == next

                && (next.state == ActivityState.PAUSED

                    || next.state == ActivityState.STOPPED

                    || next.state == ActivityState.STOPPING)) {

            // Make sure we have executed any pending transitions, since there

            // should be nothing left to do at this point.

            mService.mWindowManager.executeAppTransition();