From 2bd95dfc4dacd4165bece6ec7cc28255725b57fd Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Fri, 31 Jan 2025 00:20:52 +0000
Subject: [PATCH] Disable ENABLE_DESKTOP_MODE_THROUGH_DEV_OPTION

To avoid issues controlling when desktop mode is enabled or not.

Bug: 393404767
Test: atest DesktopModePreferenceControllerTest
Flag: EXEMPT (bug fix)
Change-Id: I67643f3fe5994dfa901b259d5c49e89f19a9210c
---
 .../development/DesktopModePreferenceControllerTest.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DesktopModePreferenceControllerTest.java
index de7faa11e29..3330d06c209 100644
--- 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