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

Commit 908b6fc7 authored by Jorge Gil's avatar Jorge Gil
Browse files

Fix failing freeform TDA unit tests in enter-desktop-by-default devices 

Devices with the enter_desktop_by_default config enabled were failing
these tests because the tests expects that config to be disabled but was
not explicitly setting up the test to disable it.

Flag: com.android.window.flags.enter_desktop_by_default_on_freeform_displays
Fix: 404227769
Test: atest DesktopTasksControllerTest
Change-Id: Ia5e6e213b08853e7e15ba943beb26f47806c5e8e
parent 06673505

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

+4 −2
Original line number Diff line number Diff line
@@ -2378,9 +2378,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER)

    @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    fun moveToFullscreen_tdaFreeform_windowingModeFullscreen_removesWallpaperActivity() {

        whenever(DesktopModeStatus.enterDesktopByDefaultOnFreeformDisplay(context))

            .thenReturn(false)

        val homeTask = setUpHomeTask()

        val task = setUpFreeformTask()



        assertNotNull(rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY))

            .configuration

            .windowConfiguration
@@ -2432,9 +2433,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND,

    )

    fun moveToFullscreen_tdaFreeform_windowingModeFullscreen_homeBehindFullscreen_multiDesksEnabled() {

        whenever(DesktopModeStatus.enterDesktopByDefaultOnFreeformDisplay(context))

            .thenReturn(false)

        val homeTask = setUpHomeTask()

        val task = setUpFreeformTask()



        assertNotNull(rootTaskDisplayAreaOrganizer.getDisplayAreaInfo(DEFAULT_DISPLAY))

            .configuration

            .windowConfiguration