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

Commit 592f7b48 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Restore single-display check for visible recent task" into...

Merge "Merge "Restore single-display check for visible recent task" into rvc-dev am: a0d33955 am: d31dac02" into rvc-d1-dev-plus-aosp
parents 86d7f74e 1fafc67f
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -1341,6 +1341,17 @@ class RecentTasks {
                break;
        }

        // Tasks managed by/associated with an ActivityView should be excluded from recents.
        // singleTaskInstance is set on the VirtualDisplay managed by ActivityView
        // TODO(b/126185105): Find a different signal to use besides isSingleTaskInstance
        final ActivityStack stack = task.getStack();
        if (stack != null) {
            DisplayContent display = stack.getDisplay();
            if (display != null && display.isSingleTaskInstance()) {
                return false;
            }
        }

        // If we're in lock task mode, ignore the root task
        if (task == mService.getLockTaskController().getRootTask()) {
            return false;