commit 155e3133407e590f18e7e16eddc6fc743f35b0fd
author Craig Mautner <cmautner@google.com> Fri Mar 28 22:16:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 28 22:16:38 2014 +0000
tree 115c5c5adf6d7226d521cfe91a7c77ed3c3a3a78
parent 6a14146b379b33a6bf947f02b2550fa97c5619b6
parent d511bc17d614b1291f1b85f84180c1db157d2790

am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."

* commit 'd511bc17d614b1291f1b85f84180c1db157d2790':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.

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 b42bce2..07c2201 100755
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2625,6 +2625,9 @@
         if (mResumedActivity == r) {
             mResumedActivity = null;
         }
+        if (mPausingActivity == r) {
+            mPausingActivity = null;
+        }
         if (mService.mFocusedActivity == r) {
             mService.mFocusedActivity = null;
         }