diff options
| author | 2016-06-27 20:50:01 +0000 | |
|---|---|---|
| committer | 2016-06-27 20:50:02 +0000 | |
| commit | 06b1d786e9360f7e577e16a0b9af6cd8b9bc9b82 (patch) | |
| tree | e386ca3e4dcb2af4033213968baa4ce5f6979154 | |
| parent | e85843224196e92e67c1330c9eabd5cf13eb1966 (diff) | |
| parent | c11ce7b1cd1d1e5cda2c1e8acb5b165cd7ce50ef (diff) | |
Merge "Resume only activities in focused stack" into nyc-dev
| -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) { |