Correctly finish activity in non-focused stack
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
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 752dbd9..5a66140 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -3562,11 +3562,18 @@
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();
}