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

am: a61fc4ff79

Change-Id: Ia879bc9ddf0cb11764e0669aa05be93da89d6f2e

1 files changed, 5 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index a6a702fbfc13..88357bbd0029 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1223,6 +1223,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) {