diff options
| author | 2016-06-27 21:02:56 +0000 | |
|---|---|---|
| committer | 2016-06-27 21:02:56 +0000 | |
| commit | fee6e7f10234ee5a060d12bdbe1de24a294966e2 (patch) | |
| tree | 1c95a90c3b8792a20f2d64950d491ca4aa2c3a30 | |
| parent | f4704889a6cce182b9e97011c3556de2a3240f1b (diff) | |
| parent | 06b1d786e9360f7e577e16a0b9af6cd8b9bc9b82 (diff) | |
Merge \"Resume only activities in focused stack\" into nyc-dev
am: 06b1d786e9
Change-Id: I05dfd276d13b97b06737fecd22b238e791c9bc2b
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 4059a675c4fd..4ead64b6915b 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 class ActivityStack { 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) { |