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

* commit '83a3908047f3438c5daf7c3b562cf9ad8fe76d71':
  Fix resumeHomeStackTask can't resume home if activity is finishing.

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);
         }