commit 446433da24b7cfb7e7625675bb9dc4e17b05f3ba
author Wale Ogunwale <ogunwale@google.com> Mon Oct 12 17:13:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 12 17:13:47 2015 +0000
tree 5bc5bf9698e4081805b207e454d0dccc14bcb643
parent b4c0ad97750b2b6be08db5afe073b6ad726d9892
parent 4b6a829ac2c7af671f131a738437f1e393b13ec6

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

* commit '4b6a829ac2c7af671f131a738437f1e393b13ec6':
  Fix resumeHomeStackTask can't resume home if activity is finishing.

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 8bec7f7..e465009 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -535,7 +535,8 @@
 
         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);
         }