Merge "[GraphicsEnvironment] Remove unnecessary prefix." (5d8bfdc5) · Commits · e / os / android_frameworks_base

core/java/android/os/GraphicsEnvironment.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -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<String> optInPackages =
		getGlobalSettingsString(contentResolver, bundle,
		Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS);
		Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS);
		final List<String> 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<String> 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) {

core/java/android/provider/Settings.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -12367,37 +12367,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.
		@@ -12413,8 +12410,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.

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -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,

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -503,11 +503,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,
		@@ -517,7 +517,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,

services/core/java/com/android/server/am/CoreSettingsObserver.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -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);