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

Commit 206589a3 authored by Toshiki Kikuchi's avatar Toshiki Kikuchi Committed by Android (Google) Code Review
Browse files

Merge "Fix displayId for desktop-first check" into main

parents 132249d4 8037ffef

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+1 −1
Original line number Diff line number Diff line
@@ -3705,7 +3705,7 @@ class DesktopTasksController( 
                    DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_POLICY_IN_LPM.isTrue ->

                    // Here we have no desk activated, but check if we really want to force a task

                    // into desktop.

                    if (rootTaskDisplayAreaOrganizer.isDisplayDesktopFirst(task.displayId)) {

                    if (rootTaskDisplayAreaOrganizer.isDisplayDesktopFirst(targetDisplayId)) {

                        if (DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_POLICY_IN_LPM.isTrue) {

                            // Fully trust the LPM's decision under desktop-first mode.

                            true