Merge "Disable ANGLE as system GLES dev option" into main

src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java

@@ -92,7 +92,17 @@ public class GraphicsDriverEnableAngleAsSystemDriverController
     // This can be enabled by calling:
     //     `adb shell setprop debug.graphics.angle.developeroption.enable true`
     private boolean isAngleDeveloperOptionEnabled() {
-        return mSystemProperties.getBoolean(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION, false);
+        boolean intendedUsingAngleDeveloperOption =
+                mSystemProperties.getBoolean(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION, false);
+        if (intendedUsingAngleDeveloperOption) {
+            Log.v(TAG,
+                    "ANGLE developer option is enabled in system properties, "
+                    + "but temporarily overridden.");
+        }
+
+        // Temporarily disabling for broader rollout.
+        // The feature requires further maturation before general availability.
+        return false;
     }
 
     @VisibleForTesting

tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java

@@ -182,7 +182,7 @@ public class GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest {
     @Test
     public void updateState_PreferenceShouldEnabled() {
         mController.updateState(mPreference);
-        assertThat(mPreference.isEnabled()).isTrue();
+        assertThat(mPreference.isEnabled()).isFalse();
     }
 
     @Test