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

Merge "Fix resumeHomeStackTask can't resume home if activity is finishing."

Browse Source
This commit is contained in:
Wale Ogunwale
2015-10-12 14:39:16 +00:00
committed by Gerrit Code Review
parent d59921149b a56ea12ca5
commit 1ca9f48127
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);
} }