From b0bccc70dddba76da384a0be8648a89ec67d04eb Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Mon, 11 Sep 2017 16:31:15 +0000 Subject: [PATCH] Revert "Make sure top activity is stopped on sleep if paused." This reverts commit 01cffc296b1c40c3fbc7533c9ef885807a8dbc6c. Reason for revert: causing b/65498626 Bug: 65457314 Fixes: 65498626 Change-Id: I47ddfcccaf94ceadf2104973402b3cdc50876a36 (cherry picked from commit 8ec884258c509860dc35e7061e1b206384b48e2a) --- services/core/java/com/android/server/am/ActivityStack.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 56ae57bd69cd..791b2c066821 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1214,11 +1214,6 @@ class ActivityStack 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) { -- 2.11.0