From 706d1ef565e13d00e153c42648e611999da9e281 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Thu, 15 Oct 2020 13:36:47 -0700 Subject: [PATCH] [GraphicsEnvironment] Remove unnecessary prefix. ANGLE global settings variables have an unnecessary prefix, remove it. Bug: b/170982184 Test: atest CtsAngleIntegrationHostTestCases Change-Id: Id98e69820c90ede16cec8e798c0c77200b951966 --- core/java/android/os/GraphicsEnvironment.java | 20 +++++++++---------- core/java/android/provider/Settings.java | 16 ++++++--------- .../settings/SettingsProtoDumpUtil.java | 12 +++++------ .../android/provider/SettingsBackupTest.java | 12 +++++------ .../server/am/CoreSettingsObserver.java | 12 +++++------ 5 files changed, 34 insertions(+), 38 deletions(-) diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index 6ba1627dde47b..be21fea1d0dfa 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -109,11 +109,11 @@ public class GraphicsEnvironment { private static final int UPDATABLE_DRIVER_GLOBAL_OPT_IN_PRERELEASE_DRIVER = 2; private static final int UPDATABLE_DRIVER_GLOBAL_OPT_IN_OFF = 3; - // Values for GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE + // Values for ANGLE_GL_DRIVER_ALL_ANGLE private static final int ANGLE_GL_DRIVER_ALL_ANGLE_ON = 1; private static final int ANGLE_GL_DRIVER_ALL_ANGLE_OFF = 0; - // Values for GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES + // Values for ANGLE_GL_DRIVER_SELECTION_VALUES private static final String ANGLE_GL_DRIVER_CHOICE_DEFAULT = "default"; private static final String ANGLE_GL_DRIVER_CHOICE_ANGLE = "angle"; private static final String ANGLE_GL_DRIVER_CHOICE_NATIVE = "native"; @@ -382,11 +382,11 @@ public class GraphicsEnvironment { final int allUseAngle; if (bundle != null) { allUseAngle = - bundle.getInt(Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE); + bundle.getInt(Settings.Global.ANGLE_GL_DRIVER_ALL_ANGLE); } else { ContentResolver contentResolver = context.getContentResolver(); allUseAngle = Settings.Global.getInt(contentResolver, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE, + Settings.Global.ANGLE_GL_DRIVER_ALL_ANGLE, ANGLE_GL_DRIVER_ALL_ANGLE_OFF); } if (allUseAngle == ANGLE_GL_DRIVER_ALL_ANGLE_ON) { @@ -402,10 +402,10 @@ public class GraphicsEnvironment { final ContentResolver contentResolver = context.getContentResolver(); final List optInPackages = getGlobalSettingsString(contentResolver, bundle, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS); + Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS); final List optInValues = getGlobalSettingsString(contentResolver, bundle, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES); + Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES); // Make sure we have good settings to use if (optInPackages.size() != optInValues.size()) { @@ -462,11 +462,11 @@ public class GraphicsEnvironment { if (coreSettings != null) { debugPackage = - coreSettings.getString(Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE); + coreSettings.getString(Settings.Global.ANGLE_DEBUG_PACKAGE); } else { ContentResolver contentResolver = context.getContentResolver(); debugPackage = Settings.Global.getString(contentResolver, - Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE); + Settings.Global.ANGLE_DEBUG_PACKAGE); } if (TextUtils.isEmpty(debugPackage)) { return ""; @@ -578,7 +578,7 @@ public class GraphicsEnvironment { final ContentResolver contentResolver = context.getContentResolver(); final List angleAllowlist = getGlobalSettingsString(contentResolver, bundle, - Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST); + Settings.Global.ANGLE_ALLOWLIST); if (DEBUG) Log.v(TAG, "ANGLE allowlist: " + angleAllowlist); @@ -678,7 +678,7 @@ public class GraphicsEnvironment { try { ContentResolver contentResolver = context.getContentResolver(); final int showDialogBox = Settings.Global.getInt(contentResolver, - Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX); + Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX); return (showDialogBox == 1); } catch (Settings.SettingNotFoundException | SecurityException e) { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b133bcd142189..d1b17c7412674 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12358,37 +12358,34 @@ public final class Settings { * to dumpable apps that opt-in. * @hide */ - public static final String GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE = - "angle_debug_package"; + public static final String ANGLE_DEBUG_PACKAGE = "angle_debug_package"; /** * Force all PKGs to use ANGLE, regardless of any other settings * The value is a boolean (1 or 0). * @hide */ - public static final String GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE = - "angle_gl_driver_all_angle"; + public static final String ANGLE_GL_DRIVER_ALL_ANGLE = "angle_gl_driver_all_angle"; /** * List of PKGs that have an OpenGL driver selected * @hide */ - public static final String GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS = + public static final String ANGLE_GL_DRIVER_SELECTION_PKGS = "angle_gl_driver_selection_pkgs"; /** * List of selected OpenGL drivers, corresponding to the PKGs in GLOBAL_SETTINGS_DRIVER_PKGS * @hide */ - public static final String GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES = + public static final String ANGLE_GL_DRIVER_SELECTION_VALUES = "angle_gl_driver_selection_values"; /** * List of package names that should check ANGLE rules * @hide */ - public static final String GLOBAL_SETTINGS_ANGLE_ALLOWLIST = - "angle_allowlist"; + public static final String ANGLE_ALLOWLIST = "angle_allowlist"; /** * Lists of ANGLE EGL features for debugging. @@ -12404,8 +12401,7 @@ public final class Settings { * The value is a boolean (1 or 0). * @hide */ - public static final String GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX = - "show_angle_in_use_dialog_box"; + public static final String SHOW_ANGLE_IN_USE_DIALOG_BOX = "show_angle_in_use_dialog_box"; /** * Updatable driver global preference for all Apps. diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index f1fb527245a13..90bed12cfd6e5 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -749,25 +749,25 @@ class SettingsProtoDumpUtil { Settings.Global.GPU_DEBUG_LAYERS, GlobalSettingsProto.Gpu.DEBUG_LAYERS); dumpSetting(s, p, - Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE, + Settings.Global.ANGLE_DEBUG_PACKAGE, GlobalSettingsProto.Gpu.ANGLE_DEBUG_PACKAGE); dumpSetting(s, p, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE, + Settings.Global.ANGLE_GL_DRIVER_ALL_ANGLE, GlobalSettingsProto.Gpu.ANGLE_GL_DRIVER_ALL_ANGLE); dumpSetting(s, p, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS, + Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS, GlobalSettingsProto.Gpu.ANGLE_GL_DRIVER_SELECTION_PKGS); dumpSetting(s, p, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES, + Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES, GlobalSettingsProto.Gpu.ANGLE_GL_DRIVER_SELECTION_VALUES); dumpSetting(s, p, - Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST, + Settings.Global.ANGLE_ALLOWLIST, GlobalSettingsProto.Gpu.ANGLE_ALLOWLIST); dumpSetting(s, p, Settings.Global.ANGLE_EGL_FEATURES, GlobalSettingsProto.Gpu.ANGLE_EGL_FEATURES); dumpSetting(s, p, - Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX, + Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX, GlobalSettingsProto.Gpu.SHOW_ANGLE_IN_USE_DIALOG); dumpSetting(s, p, Settings.Global.GPU_DEBUG_LAYER_APP, diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 69be14413583e..f6ffb4f0e0b07 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -501,11 +501,11 @@ public class SettingsBackupTest { Settings.Global.GPU_DEBUG_APP, Settings.Global.GPU_DEBUG_LAYERS, Settings.Global.GPU_DEBUG_LAYERS_GLES, - Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS, - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES, - Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST, + Settings.Global.ANGLE_DEBUG_PACKAGE, + Settings.Global.ANGLE_GL_DRIVER_ALL_ANGLE, + Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS, + Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES, + Settings.Global.ANGLE_ALLOWLIST, Settings.Global.ANGLE_EGL_FEATURES, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS, @@ -515,7 +515,7 @@ public class SettingsBackupTest { Settings.Global.UPDATABLE_DRIVER_PRODUCTION_DENYLIST, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_ALLOWLIST, Settings.Global.UPDATABLE_DRIVER_SPHAL_LIBRARIES, - Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX, + Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX, Settings.Global.GPU_DEBUG_LAYER_APP, Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT, diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java index 529c6516398ee..f32423f753241 100644 --- a/services/core/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java @@ -85,19 +85,19 @@ final class CoreSettingsObserver extends ContentObserver { sGlobalSettingToTypeMap.put( Settings.Global.DEBUG_VIEW_ATTRIBUTES_APPLICATION_PACKAGE, String.class); sGlobalSettingToTypeMap.put( - Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE, String.class); + Settings.Global.ANGLE_DEBUG_PACKAGE, String.class); sGlobalSettingToTypeMap.put( - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE, int.class); + Settings.Global.ANGLE_GL_DRIVER_ALL_ANGLE, int.class); sGlobalSettingToTypeMap.put( - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS, String.class); + Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS, String.class); sGlobalSettingToTypeMap.put( - Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES, String.class); + Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES, String.class); sGlobalSettingToTypeMap.put( - Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST, String.class); + Settings.Global.ANGLE_ALLOWLIST, String.class); sGlobalSettingToTypeMap.put( Settings.Global.ANGLE_EGL_FEATURES, String.class); sGlobalSettingToTypeMap.put( - Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX, String.class); + Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX, String.class); sGlobalSettingToTypeMap.put(Settings.Global.ENABLE_GPU_DEBUG_LAYERS, int.class); sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_APP, String.class); sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_LAYERS, String.class);