Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-16 02:04:09 +00:00
committed by Android (Google) Code Review
parent fca79abeea 37fc6b90ca
commit 5600015ef0
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/TaskLaunchParamsModifier.java
View File

@@ -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);