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

2014-03-28 20:27:32 +00:00
parent e328056ddc 82a91631d5
commit d511bc17d6
1 changed files with 3 additions and 0 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2625,6 +2625,9 @@ final class ActivityStack {
        if (mResumedActivity == r) {
            mResumedActivity = null;
        }
+        if (mPausingActivity == r) {
+            mPausingActivity = null;
+        }
        if (mService.mFocusedActivity == r) {
            mService.mFocusedActivity = null;
        }