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

Commit 8037ffef authored by Toshiki Kikuchi's avatar Toshiki Kikuchi
Browse files

Fix displayId for desktop-first check 

This CL fixes the displayId for desktop-first check in
handleFreeformTaskLaunch.
It should have been targetDisplayId instead of sourceDisplayId.

Flag: com.android.window.flags.enable_desktop_first_top_fullscreen_bugfix
Bug: 431066262
Test: DesktopTasksControllerTests
Change-Id: I6956fe324585a7c92246a5ec7c934658dfd78d71
parent 4719e35a

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

+1 −1
Original line number Diff line number Diff line
@@ -3530,7 +3530,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