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 am: 06b1d786e9

Browse Source 
am: fee6e7f102

Change-Id: Idbf14558dfacaa7eecee4cb8f747d0aa4aa67dee
This commit is contained in:
Andrii Kulian
2016-06-27 21:07:15 +00:00
committed by android-build-merger
parent f359e16671 fee6e7f102
commit b8ca10630c
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) {