Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1f25ad5 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev

parents 1244ff19 03157027
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -1912,9 +1912,11 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
                } else if (mStackId == FULLSCREEN_WORKSPACE_STACK_ID) {
                    if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Skipping after task=" + task
                            + " returning to non-application type=" + task.getTaskToReturnTo());
                    // Once we reach a fullscreen task that should return to another task, then no
                    // other activities behind that one should be visible.
                    if (task.getTaskToReturnTo() != APPLICATION_ACTIVITY_TYPE) {
                    // Once we reach a fullscreen stack task that has a running activity and should
                    // return to another stack task, then no other activities behind that one should
                    // be visible.
                    if (task.topRunningActivityLocked() != null &&
                            task.getTaskToReturnTo() != APPLICATION_ACTIVITY_TYPE) {
                        behindFullscreenActivity = true;
                    }
                }