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

Commit a61fc4ff authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

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

am: 8c8ae38e

Change-Id: I174e78c4f26f9b9fa77a91c04353c75a2197ebd4
parents 646726f2 8c8ae38e

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) {