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

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

Browse Source 
* commit '4b6a829ac2c7af671f131a738437f1e393b13ec6':
  Fix resumeHomeStackTask can't resume home if activity is finishing.
This commit is contained in:
Wale Ogunwale
2015-10-12 17:13:47 +00:00
committed by Android Git Automerger
parent b4c0ad9775 4b6a829ac2
commit 446433da24
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

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