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

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

Merge "Revert "Make sure top activity is stopped on sleep if paused."" into... 

Merge "Revert "Make sure top activity is stopped on sleep if paused."" into oc-mr1-dev am: 8af60e4c
am: 8dd7d067

Change-Id: Ib23207b08a56d4d1883b1b4dc33debe25c76d471
parents 32889f4d 8dd7d067

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

+0 −5
Original line number Diff line number Diff line
@@ -1223,11 +1223,6 @@ 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 (mLastPausedActivity == topActivity()) {

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

            // state.

            stopActivityLocked(mLastPausedActivity);

            shouldSleep = false;

        }



        if (!shuttingDown) {