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

Commit d42dbfc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Re-route to default display if the home activity doesn't support... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174200

Change-Id: Ia6c79c0e0fc99a9a5852dbb2dc7bbdbe9ae86172
parents d0f485f0 5600015e

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

+7 −0
Original line number Diff line number Diff line
@@ -439,6 +439,13 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
            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)

                ? taskDisplayArea

                : getFallbackDisplayAreaForActivity(activityRecord, request);