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

2015-10-12 14:39:16 +00:00
parent d59921149b a56ea12ca5
commit 1ca9f48127
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -511,7 +511,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);
        }