commit 5314a40b96c7c3ecc0dafeda387efe49a5c434e4
author Craig Mautner <cmautner@google.com> Thu Sep 26 12:40:16 2013 -0700
committer Craig Mautner <cmautner@google.com> Thu Sep 26 14:24:02 2013 -0700
tree 69f40a925b4981c3fabfd5ccde0da5dd36aa3177
parent 4e9c7d8ba3caa8b558e2a1de796c100a562445ae

Revert behavior to perform onResume.

Back out changes from CLs ag/363992 and ag/363859. These introduced
the bugs found in bug 10917435 which is now fixed. Note that backing
out these changes reintroduces bug 10732489.

Change-Id: Ic5105dd4cfc8bf79c6f06188283d1ee3680c370c

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

diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index f11dca9..1ee13ec 100644
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -122,7 +122,7 @@
     WindowManagerService mWindowManager;
 
     /** Dismiss the keyguard after the next activity is displayed? */
-    private boolean mDismissKeyguardOnNextActivity = false;
+    boolean mDismissKeyguardOnNextActivity = false;
 
     /** Identifier counter for all ActivityStacks */
     private int mLastStackId = HOME_STACK_ID;
@@ -232,6 +232,7 @@
     }
 
     void dismissKeyguard() {
+        if (ActivityManagerService.DEBUG_LOCKSCREEN) mService.logLockScreen("");
         if (mDismissKeyguardOnNextActivity) {
             mDismissKeyguardOnNextActivity = false;
             mWindowManager.dismissKeyguard();
@@ -310,6 +311,7 @@
     }
 
     void setDismissKeyguard(boolean dismiss) {
+        if (ActivityManagerService.DEBUG_LOCKSCREEN) mService.logLockScreen(" dismiss=" + dismiss);
         mDismissKeyguardOnNextActivity = dismiss;
     }
 
@@ -468,15 +470,14 @@
     /**
      * Pause all activities in either all of the stacks or just the back stacks.
      * @param userLeaving Passed to pauseActivity() to indicate whether to call onUserLeaving().
-     * @param allStacks Whether to pause all the stacks (true), or just the back stacks (false).
      * @return true if any activity was paused as a result of this call.
      */
-    boolean pauseStacks(boolean userLeaving, boolean allStacks) {
+    boolean pauseBackStacks(boolean userLeaving) {
         boolean someActivityPaused = false;
         for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
             final ActivityStack stack = mStacks.get(stackNdx);
-            if ((allStacks || !isFrontStack(stack)) && stack.mResumedActivity != null) {
-                if (DEBUG_STATES) Slog.d(TAG, "pauseStacks: stack=" + stack +
+            if (!isFrontStack(stack) && stack.mResumedActivity != null) {
+                if (DEBUG_STATES) Slog.d(TAG, "pauseBackStacks: stack=" + stack +
                         " mResumedActivity=" + stack.mResumedActivity);
                 stack.startPausingLocked(userLeaving, false);
                 someActivityPaused = true;
@@ -2157,6 +2158,9 @@
         for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
             final ActivityStack stack = mStacks.get(stackNdx);
             stack.awakeFromSleepingLocked();
+            if (isFrontStack(stack)) {
+                resumeTopActivitiesLocked();
+            }
         }
         mGoingToSleepActivities.clear();
     }