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

Commit 5600015e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Re-route to default display if the home activity doesn't support multi-display" into sc-dev

parents fca79abe 37fc6b90

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -439,6 +439,13 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
            taskDisplayArea = mSupervisor.mRootWindowContainer.getDefaultTaskDisplayArea();

            taskDisplayArea = mSupervisor.mRootWindowContainer.getDefaultTaskDisplayArea();

        }

        }





        // Re-route to default display if the home activity doesn't support multi-display

        if (taskDisplayArea != null && activityRecord.isActivityTypeHome()

                && !mSupervisor.mRootWindowContainer.canStartHomeOnDisplayArea(activityRecord.info,

                        taskDisplayArea, false /* allowInstrumenting */)) {

            taskDisplayArea = mSupervisor.mRootWindowContainer.getDefaultTaskDisplayArea();

        }



        return (taskDisplayArea != null)

        return (taskDisplayArea != null)

                ? taskDisplayArea

                ? taskDisplayArea

                : getFallbackDisplayAreaForActivity(activityRecord, request);

                : getFallbackDisplayAreaForActivity(activityRecord, request);