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

Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev

Browse Source
This commit is contained in:
Andrii Kulian
2016-08-29 18:30:06 +00:00
committed by Android (Google) Code Review
parent 2b4e612b10 620040db3f
commit 128a4419e9
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3545,11 +3545,18 @@ final class ActivityStack {
if (mode == FINISH_IMMEDIATELY if (mode == FINISH_IMMEDIATELY
|| (prevState == ActivityState.PAUSED || (prevState == ActivityState.PAUSED
&& (mode == FINISH_AFTER_PAUSE || mStackId == PINNED_STACK_ID)) && (mode == FINISH_AFTER_PAUSE || mode == FINISH_AFTER_VISIBLE
|| mStackId == PINNED_STACK_ID))
|| prevState == ActivityState.STOPPED || prevState == ActivityState.STOPPED
|| prevState == ActivityState.INITIALIZING) { || prevState == ActivityState.INITIALIZING) {
r.makeFinishingLocked(); r.makeFinishingLocked();
boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm"); boolean activityRemoved = destroyActivityLocked(r, true, "finish-imm");
if (prevState == ActivityState.PAUSED && mode == FINISH_AFTER_VISIBLE) {
// Finishing activity that was in paused state - this can happen if it was in
// not currently focused stack. Need to make something visible in its place.
mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
}
if (activityRemoved) { if (activityRemoved) {
mStackSupervisor.resumeFocusedStackTopActivityLocked(); mStackSupervisor.resumeFocusedStackTopActivityLocked();
} }

2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1049,7 +1049,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
return r; return r;
} }
// Return to the home stack. // Look in other non-focused and non-home stacks.
final ArrayList<ActivityStack> stacks = mHomeStack.mStacks; final ArrayList<ActivityStack> stacks = mHomeStack.mStacks;
for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) { for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
final ActivityStack stack = stacks.get(stackNdx); final ActivityStack stack = stacks.get(stackNdx);