Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c93a am: 8d7604a4cb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272621

Change-Id: I4bbdb5252dcf1e73bdd0b05e382bb8a6482bd8df
This commit is contained in:
Peiyong Lin
2020-08-01 07:01:51 +00:00
committed by Automerger Merge Worker
parent 696d25e48c 8d7604a4cb
commit a5220103f1
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/GraphicsEnvironment.java
View File

@@ -570,7 +570,7 @@ public class GraphicsEnvironment {
final ContentResolver contentResolver = context.getContentResolver();
final List<String> angleAllowlist =
getGlobalSettingsString(contentResolver, bundle,
Settings.Global.GLOBAL_SETTINGS_ANGLE_WHITELIST);
Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST);
if (DEBUG) Log.v(TAG, "ANGLE allowlist: " + angleAllowlist);

4
core/java/android/provider/Settings.java
View File

@@ -12268,8 +12268,8 @@ public final class Settings {
* List of package names that should check ANGLE rules
* @hide
*/
public static final String GLOBAL_SETTINGS_ANGLE_WHITELIST =
"angle_whitelist";
public static final String GLOBAL_SETTINGS_ANGLE_ALLOWLIST =
"angle_allowlist";
/**
* Show the "ANGLE In Use" dialog box to the user when ANGLE is the OpenGL driver.

2
core/proto/android/providers/settings/global.proto
View File

@@ -449,7 +449,7 @@ message GlobalSettingsProto {
// Game Driver - List of Apps that are allowed to use Game Driver
optional SettingProto game_driver_allowlist = 12;
// ANGLE - List of Apps that can check ANGLE rules
optional SettingProto angle_whitelist = 13;
optional SettingProto angle_allowlist = 13;
// Game Driver - List of denylists, each denylist is a denylist for
// a specific Game Driver version
optional SettingProto game_driver_denylists = 14;

4
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -761,8 +761,8 @@ class SettingsProtoDumpUtil {
Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES,
GlobalSettingsProto.Gpu.ANGLE_GL_DRIVER_SELECTION_VALUES);
dumpSetting(s, p,
Settings.Global.GLOBAL_SETTINGS_ANGLE_WHITELIST,
GlobalSettingsProto.Gpu.ANGLE_WHITELIST);
Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST,
GlobalSettingsProto.Gpu.ANGLE_ALLOWLIST);
dumpSetting(s, p,
Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX,
GlobalSettingsProto.Gpu.SHOW_ANGLE_IN_USE_DIALOG);

2
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -502,7 +502,7 @@ public class SettingsBackupTest {
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_WHITELIST,
Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST,
Settings.Global.GAME_DRIVER_ALL_APPS,
Settings.Global.GAME_DRIVER_OPT_IN_APPS,
Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS,

2
services/core/java/com/android/server/am/CoreSettingsObserver.java
View File

@@ -92,7 +92,7 @@ final class CoreSettingsObserver extends ContentObserver {
sGlobalSettingToTypeMap.put(
Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES, String.class);
sGlobalSettingToTypeMap.put(
Settings.Global.GLOBAL_SETTINGS_ANGLE_WHITELIST, String.class);
Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST, String.class);
sGlobalSettingToTypeMap.put(
Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX, String.class);
sGlobalSettingToTypeMap.put(Settings.Global.ENABLE_GPU_DEBUG_LAYERS, int.class);