commit d511bc17d614b1291f1b85f84180c1db157d2790
author Craig Mautner <cmautner@google.com> Fri Mar 28 20:27:32 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 28 20:27:33 2014 +0000
tree 23976cc97b3849ecc2244e4330474b44043d54b4
parent e328056ddcba0edd0e49b4697dfcc84f3658cb39
parent 82a91631d58d0d378ae93afc034aef3b44aef81b

Merge "[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;
         }