commit 06b1d786e9360f7e577e16a0b9af6cd8b9bc9b82
author Andrii Kulian <akulian@google.com> Mon Jun 27 20:50:01 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 27 20:50:02 2016 +0000
tree e386ca3e4dcb2af4033213968baa4ce5f6979154
parent e85843224196e92e67c1330c9eabd5cf13eb1966
parent c11ce7b1cd1d1e5cda2c1e8acb5b165cd7ce50ef

Merge "Resume only activities in focused stack" into nyc-dev

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 4059a67..4ead64b 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1706,7 +1706,8 @@
         final boolean stackInvisible = stackVisibility != STACK_VISIBLE;
         final boolean stackVisibleBehind = stackVisibility == STACK_VISIBLE_ACTIVITY_BEHIND;
         boolean behindFullscreenActivity = stackInvisible;
-        boolean resumeNextActivity = isFocusable() && (isInStackLocked(starting) == null);
+        boolean resumeNextActivity = mStackSupervisor.isFocusedStack(this)
+                && (isInStackLocked(starting) == null);
         boolean behindTranslucentActivity = false;
         final ActivityRecord visibleBehind = getVisibleBehindActivity();
         for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {