Merge "Disable ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION" into main

2025-02-03 04:42:10 -08:00
parent af8b44deeb 2bd95dfc4d
commit a5e3d39db8
1 changed files with 1 additions and 0 deletions
--- a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
@@ -61,6 +61,7 @@ import org.robolectric.shadows.ShadowSystemProperties;
        com.android.settings.testutils.shadow.ShadowFragment.class,
 })
@EnableFlags(Flags.FLAG_SHOW_DESKTOP_WINDOWING_DEV_OPTION)
+@DisableFlags(Flags.FLAG_ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION)
 public class DesktopModePreferenceControllerTest {

    @Rule