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

am 83a39080: am 1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."

Browse Source 
* commit '83a3908047f3438c5daf7c3b562cf9ad8fe76d71':
  Fix resumeHomeStackTask can't resume home if activity is finishing.
This commit is contained in:
Wale Ogunwale
2015-10-12 14:50:32 +00:00
committed by Android Git Automerger
parent 94127464b4 83a3908047
commit 4b6a829ac2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -511,7 +511,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
mHomeStack.moveHomeStackTaskToTop(homeStackTaskType); mHomeStack.moveHomeStackTaskToTop(homeStackTaskType);
ActivityRecord r = getHomeActivity(); ActivityRecord r = getHomeActivity();
if (r != null) { // Only resume home activity if isn't finishing.
if (r != null && !r.finishing) {
mService.setFocusedActivityLocked(r, reason); mService.setFocusedActivityLocked(r, reason);
return resumeTopActivitiesLocked(mHomeStack, prev, null); return resumeTopActivitiesLocked(mHomeStack, prev, null);
} }