Merge "Fix failing freeform TDA unit tests in enter-desktop-by-default devices" into main (697c0d47) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -2380,9 +2380,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
		@@ -2434,9 +2435,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