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

Commit 8c8ae38e authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Make sure top activity is stopped on sleep if paused." into oc-mr1-dev

parents 9cbaa8c7 5b21f521

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

+5 −0
Original line number Diff line number Diff line
@@ -1214,6 +1214,11 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
            // Still waiting for something to pause; can't sleep yet.

            if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Sleep still waiting to pause " + mPausingActivity);

            shouldSleep = false;

        } else if (topActivity() != null && topActivity().state == ActivityState.PAUSED) {

            // Our top activity is currently paused, we need to ensure we move it to the stopped

            // state.

            stopActivityLocked(mLastPausedActivity);

            shouldSleep = false;

        }



        if (!shuttingDown) {