Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2014-03-28 20:27:32 +00:00
committed by Gerrit Code Review
parent e328056ddc 82a91631d5
commit d511bc17d6
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/am/ActivityStack.java
View File

@@ -2625,6 +2625,9 @@ final class ActivityStack {
if (mResumedActivity == r) { if (mResumedActivity == r) {
mResumedActivity = null; mResumedActivity = null;
} }
if (mPausingActivity == r) {
mPausingActivity = null;
}
if (mService.mFocusedActivity == r) { if (mService.mFocusedActivity == r) {
mService.mFocusedActivity = null; mService.mFocusedActivity = null;
} }