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

DO NOT MERGE -- Correctly finish activity in non-focused stack

Browse Source 
When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.

Bug: 29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
(cherry picked from commit 7318d63ba6)
This commit is contained in:
Andrii Kulian
2016-07-20 18:59:28 -07:00
parent c2b9d55818
commit 620040db3f
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
|| (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.INITIALIZING) {
r.makeFinishingLocked();
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) {
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 to the home stack.
// Look in other non-focused and non-home stacks.
final ArrayList<ActivityStack> stacks = mHomeStack.mStacks;
for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {
final ActivityStack stack = stacks.get(stackNdx);