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

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

Browse Source 
* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
This commit is contained in:
Craig Mautner
2014-03-28 23:05:42 +00:00
committed by Android Git Automerger
parent c9b937bbfa 155e313340
commit 1872ce3e7a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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