diff options
| author | 2016-06-27 21:02:56 +0000 | |
|---|---|---|
| committer | 2016-06-27 21:02:56 +0000 | |
| commit | bb7c5aca254bedb7dce4aa47e1da2782fd67d9cf (patch) | |
| tree | 977471e7e25a863096454850d110f719b2539ace | |
| parent | 573e85fff884560d9c0551c45216ae64f298a5aa (diff) | |
| parent | 06b1d786e9360f7e577e16a0b9af6cd8b9bc9b82 (diff) | |
Merge \"Resume only activities in focused stack\" into nyc-dev
am: 06b1d786e9
Change-Id: I699695002213bdc0482d6b44447a5c26a27445d1
| -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) { |