Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 06b1d786e9

Change-Id: I699695002213bdc0482d6b44447a5c26a27445d1
This commit is contained in:
Andrii Kulian
2016-06-27 21:02:56 +00:00
committed by android-build-merger
parent 573e85fff8 06b1d786e9
commit bb7c5aca25
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -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) {