From 774378530f4a9ccabd3dae2d962bab2d7bb3530a Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Fri, 22 Sep 2023 23:27:51 +0000 Subject: [PATCH] Add debug property to safe guard ANGLE developer option UI. Add a debug property to guard ANGLE developer option UI, only when the debug property is enabled will ANGLE developer option UI be enabled. Add further clarification in the text to indicate that this is an experimental feature. Bug: b/287909344 Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerTest Change-Id: Ife31f4b0426f3ce107f86cfbaf3f1aeca567e250 --- res/values/strings.xml | 4 +-- ...erEnableAngleAsSystemDriverController.java | 26 +++++++++++++++++++ ...GraphicsDriverSystemPropertiesWrapper.java | 9 +++++++ ...ableAngleAsSystemDriverControllerTest.java | 2 ++ ...ngleAsSystemDriverControllerJUnitTest.java | 4 +++ 5 files changed, 43 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index f8b770f5b21..4b8c39ecf31 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10618,9 +10618,9 @@ - Enable ANGLE + Experimental: Enable ANGLE - Enable ANGLE as default OpenGL ES driver. Enabling it on incompatible devices may break some applications. + Warning: Enable ANGLE as default OpenGL ES driver. This feature is in experiment and may not be compatible with some camera and video apps. A reboot is required to change the system OpenGL ES driver diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java index b3af95ec0cc..95cf64c6226 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverController.java @@ -57,6 +57,10 @@ public class GraphicsDriverEnableAngleAsSystemDriverController @VisibleForTesting static final String PROPERTY_PERSISTENT_GRAPHICS_EGL = "persist.graphics.egl"; + @VisibleForTesting + static final String PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION = + "debug.graphics.angle.developeroption.enable"; + @VisibleForTesting static final String ANGLE_DRIVER_SUFFIX = "angle"; @VisibleForTesting @@ -72,6 +76,11 @@ public class GraphicsDriverEnableAngleAsSystemDriverController public void set(String key, String val) { SystemProperties.set(key, val); } + + @Override + public boolean getBoolean(String key, boolean def) { + return SystemProperties.getBoolean(key, def); + } }; } } @@ -81,6 +90,13 @@ public class GraphicsDriverEnableAngleAsSystemDriverController this(context, fragment, new Injector()); } + // Return true if the ANGLE developer option entry point is enabled. + // 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); + } + private boolean isAngleSupported() { return TextUtils.equals( mSystemProperties.get(PROPERTY_RO_GFX_ANGLE_SUPPORTED, ""), "true"); @@ -96,6 +112,10 @@ public class GraphicsDriverEnableAngleAsSystemDriverController // Exception is when user chooses to reboot now, the switch should keep its current value // and persist its' state over reboot. mShouldToggleSwitchBackOnRebootDialogDismiss = true; + final String persistGraphicsEglValue = + mSystemProperties.get(PROPERTY_PERSISTENT_GRAPHICS_EGL, ""); + Log.v(TAG, "Value of " + PROPERTY_PERSISTENT_GRAPHICS_EGL + " is: " + + persistGraphicsEglValue); } @Override @@ -149,6 +169,12 @@ public class GraphicsDriverEnableAngleAsSystemDriverController mPreference.setEnabled(false); ((SwitchPreference) mPreference).setChecked(false); } + + // Regardless of whether ANGLE is enabled, disable the developer option UI + // as long as UI is not enabled via debug property. + if (!isAngleDeveloperOptionEnabled()) { + mPreference.setEnabled(false); + } } @Override diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java index 549cd81c565..96842821521 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverSystemPropertiesWrapper.java @@ -41,4 +41,13 @@ interface GraphicsDriverSystemPropertiesWrapper { * SELinux. libc will log the underlying reason. */ void set(@NonNull String key, @Nullable String val); + + /** + * Get the boolean value for the given {@code key}. + * + * @param key the key to lookup + * @param def the default value in case the property is not set or empty + * @return if the {@code key} isn't found, return {@code def}. + */ + boolean getBoolean(@NonNull String key, @NonNull boolean def); } diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerTest.java index 9210b870d77..249acf5e539 100644 --- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development.graphicsdriver; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.ANGLE_DRIVER_SUFFIX; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_PERSISTENT_GRAPHICS_EGL; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_RO_GFX_ANGLE_SUPPORTED; @@ -67,6 +68,7 @@ public class GraphicsDriverEnableAngleAsSystemDriverControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; + ShadowSystemProperties.override(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION, "true"); doReturn(mTransaction).when(mFragmentManager).beginTransaction(); doReturn(mFragmentManager).when(mActivity).getSupportFragmentManager(); doReturn(mActivity).when(mFragment).getActivity(); 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 ae35431fef7..4aa38ae4aa2 100644 --- a/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java +++ b/tests/unit/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest.java @@ -18,12 +18,14 @@ package com.android.settings.development.graphicsdriver; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.ANGLE_DRIVER_SUFFIX; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.Injector; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_PERSISTENT_GRAPHICS_EGL; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableAngleAsSystemDriverController.PROPERTY_RO_GFX_ANGLE_SUPPORTED; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; @@ -98,6 +100,8 @@ public class GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest { } mContext = ApplicationProvider.getApplicationContext(); + when(mSystemPropertiesMock.getBoolean(eq(PROPERTY_DEBUG_ANGLE_DEVELOPER_OPTION), + anyBoolean())).thenReturn(true); // Construct a GraphicsDriverEnableAngleAsSystemDriverController with two Overrides: // 1) Override the mSystemProperties with mSystemPropertiesMock,