From 5a3cfb9f0cb93911ac352f730e2d0e3396259ae9 Mon Sep 17 00:00:00 2001 From: Solti Date: Thu, 19 Dec 2024 17:30:11 +0000 Subject: [PATCH] Disable ANGLE as system GLES dev option This change prevents the feature from being inadvertently exposed to the wider user base while it undergoes further refinement and stabilization for a smoother user experience. Test: atest SettingsUnitTests:com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest Test: locally build Husky and confirm the dev option is disabled, even with the "debug.graphics.angle.developeroption.enable" prop set. Flag: EXEMPT bugfix Bug: b/384047927 Change-Id: I160840a25d38bf305871d7e146745df0d56f0227 --- ...icsDriverEnableAngleAsSystemDriverController.java | 12 +++++++++++- ...EnableAngleAsSystemDriverControllerJUnitTest.java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java index e7ee9e1c37e..1ffbb50e548 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java +++ b/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 diff --git a/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java b/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java index 8304e5d6083..e65a2491a7d 100644 --- a/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java +++ b/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