diff options
| author | 2016-06-27 21:07:15 +0000 | |
|---|---|---|
| committer | 2016-06-27 21:07:15 +0000 | |
| commit | b8ca10630c9421cf665257c04cc294549c65cfc6 (patch) | |
| tree | 088dbf91e26f643131dc831f4165b85538fc5b40 | |
| parent | f359e16671d9097f65e4a218ca322973152a8ed1 (diff) | |
| parent | fee6e7f10234ee5a060d12bdbe1de24a294966e2 (diff) | |
Merge \\"Resume only activities in focused stack\\" into nyc-dev am: 06b1d786e9
am: fee6e7f102
Change-Id: Idbf14558dfacaa7eecee4cb8f747d0aa4aa67dee
| -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 8fb10fdc1ea5..6d229466ebf9 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) { |