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

Commit e22d9d10 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Select the focused display as fallback only if the display can host tasks" into main

parents 6b54ec28 6bfc30d2

services/core/java/com/android/server/wm/LaunchParamsUtil.java

+10 −3
Original line number Diff line number Diff line
@@ -453,9 +453,16 @@ class LaunchParamsUtil { 
        }



        if (com.android.window.flags.Flags.fallbackToFocusedDisplay()) {

            // Select the TDA from the top focused display.

            final TaskDisplayArea defaultTaskDisplayArea = supervisor.mRootWindowContainer

                    .getTopFocusedDisplayContent().getDefaultTaskDisplayArea();

            // Select the TDA from the top focused display if possible.

            final DisplayContent focusedDisplay =

                    supervisor.mRootWindowContainer.getTopFocusedDisplayContent();

            final TaskDisplayArea defaultTaskDisplayArea;

            if (focusedDisplay.mDisplay.canHostTasks()) {

                defaultTaskDisplayArea = focusedDisplay.getDefaultTaskDisplayArea();

            } else {

                defaultTaskDisplayArea =

                        supervisor.mRootWindowContainer.getDefaultTaskDisplayArea();

            }

            logger.accept("display-area-from-default-fallback=" + defaultTaskDisplayArea);

            return defaultTaskDisplayArea;

        } else {