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

Commit b0bccc70 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-team Robot
Browse files

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

This reverts commit 01cffc29.

Reason for revert: causing b/65498626

Bug: 65457314
Fixes: 65498626
Change-Id: I47ddfcccaf94ceadf2104973402b3cdc50876a36
(cherry picked from commit 8ec88425)
parent d5a19636

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

+0 −5
Original line number Diff line number Diff line
@@ -1214,11 +1214,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) {