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

Commit e6cbb340 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Disregard closing activities when blocking previous activities." into... 

Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev am: f1f25ad5
am: 3d820b3f

Change-Id: Ic9ab6e6e4de45347ee2936738bdd0d88e2493789
parents 7d9d29eb 3d820b3f

services/core/java/com/android/server/am/ActivityStack.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -1875,9 +1875,11 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
                } else if (mStackId == FULLSCREEN_WORKSPACE_STACK_ID) {

                } else if (mStackId == FULLSCREEN_WORKSPACE_STACK_ID) {

                    if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Skipping after task=" + task

                    if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Skipping after task=" + task

                            + " returning to non-application type=" + task.getTaskToReturnTo());

                            + " returning to non-application type=" + task.getTaskToReturnTo());

                    // Once we reach a fullscreen task that should return to another task, then no

                    // Once we reach a fullscreen stack task that has a running activity and should

                    // other activities behind that one should be visible.

                    // return to another stack task, then no other activities behind that one should

                    if (task.getTaskToReturnTo() != APPLICATION_ACTIVITY_TYPE) {

                    // be visible.

                    if (task.topRunningActivityLocked() != null &&

                            task.getTaskToReturnTo() != APPLICATION_ACTIVITY_TYPE) {

                        behindFullscreenActivity = true;

                        behindFullscreenActivity = true;

                    }

                    }

                }

                }