diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-28 22:16:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-28 22:16:38 +0000 |
| commit | 155e3133407e590f18e7e16eddc6fc743f35b0fd (patch) | |
| tree | 115c5c5adf6d7226d521cfe91a7c77ed3c3a3a78 /services | |
| parent | 6a14146b379b33a6bf947f02b2550fa97c5619b6 (diff) | |
| parent | d511bc17d614b1291f1b85f84180c1db157d2790 (diff) | |
| download | frameworks_base-155e3133407e590f18e7e16eddc6fc743f35b0fd.zip frameworks_base-155e3133407e590f18e7e16eddc6fc743f35b0fd.tar.gz frameworks_base-155e3133407e590f18e7e16eddc6fc743f35b0fd.tar.bz2 | |
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.
Diffstat (limited to 'services')
| -rwxr-xr-x | services/java/com/android/server/am/ActivityStack.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ final class ActivityStack { if (mResumedActivity == r) { mResumedActivity = null; } + if (mPausingActivity == r) { + mPausingActivity = null; + } if (mService.mFocusedActivity == r) { mService.mFocusedActivity = null; } |