commit f77c1eb1e0160364bb23972238952ee4f7b08c29
author Craig Mautner <cmautner@google.com> Tue Sep 24 17:31:57 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 24 17:31:57 2013 -0700
tree aecf7e3af85dd4f12c05b6068aa06366b8a5a1e7
parent 6dda4984cf636c2804ee6c6b109bcbb69d4baa04
parent 8488f9fa2e38e75e7ecbaac7d776900f8f1e5917

am 8488f9fa: Merge "Be less aggressive when not resuming top activity" into klp-dev

* commit '8488f9fa2e38e75e7ecbaac7d776900f8f1e5917':
  Be less aggressive when not resuming top activity

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

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index c760a3b..bd561fd 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1190,10 +1190,6 @@
     }
 
     final boolean resumeTopActivityLocked(ActivityRecord prev, Bundle options) {
-        if (mService.mLockScreenState == ActivityManagerService.LOCK_SCREEN_FIRST_SHOWN) {
-            return false;
-        }
-
         // Find the first activity that is not finishing.
         ActivityRecord next = topRunningActivityLocked(null);
 
@@ -1255,9 +1251,10 @@
 
         // If we are sleeping, and there is no resumed activity, and the top
         // activity is paused, well that is the state we want.
-        if ((mService.isSleepingOrShuttingDown())
+        if (mService.mLockScreenState == ActivityManagerService.LOCK_SCREEN_FIRST_SHOWN ||
+                (mService.isSleepingOrShuttingDown()
                 && mLastPausedActivity == next
-                && mStackSupervisor.allPausedActivitiesComplete()) {
+                && mStackSupervisor.allPausedActivitiesComplete())) {
             // Make sure we have executed any pending transitions, since there
             // should be nothing left to do at this point.
             mWindowManager.executeAppTransition();