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

am: f243b1f40b

Change-Id: Id5bd84cbec504aadb89286b38ec0b602160b13b5

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

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