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

Commit 6d04ae87 authored by Jorge Gil's avatar Jorge Gil
Browse files

Desks: Obtain default desk if needed behind flag 

Moves usages of #getOrCreateDefaultDeskIdSuspending behind a flag.

Flag: com.android.window.flags.default_desk_without_warmup_migration
Fix: 410595598
Bug: 406890311
Test: move to desktop using handle menu, no coroutines invoked
Change-Id: I76d416e76dfa22101a5c9e1f71fbaea19d0bf50c
parent e8224f49

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

+4 −1
Original line number Diff line number Diff line
@@ -694,7 +694,10 @@ class DesktopTasksController( 
            logW("moveTaskToDefaultDeskAndActivate display=$displayId does not support desk")

            return false

        }

        if (!DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) {

        if (

            !DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue ||

                !DesktopExperienceFlags.ENABLE_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION.isTrue

        ) {

            val deskId = getOrCreateDefaultDeskId(displayId) ?: return false

            return moveTaskToDesk(

                taskId = taskId,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+4 −1
Original line number Diff line number Diff line
@@ -9112,7 +9112,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> =

            FlagsParameterization.allCombinationsOf(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

            FlagsParameterization.allCombinationsOf(

                Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

                Flags.FLAG_DEFAULT_DESK_WITHOUT_WARMUP_MIGRATION,

            )

    }

}