diff options
| author | Peiyong Lin <lpy@google.com> | 2020-08-01 06:40:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-01 06:40:51 +0000 |
| commit | 8d7604a4cb656086a78c5e3fd1c250c5e972a722 (patch) | |
| tree | 6c14ab802295eeb7c6df09208dc3aec8ab81b921 /packages/SettingsProvider | |
| parent | eac0d11024f0dbea4bcf529f0baf532353090f17 (diff) | |
| parent | 094c85c93ac4fa96077e8789ce2c43495d68b289 (diff) | |
Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c93a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272621
Change-Id: I4caee590c4fdd4f0d595ae091332555dff3654a8
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java | 4 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 6fd6f711927d..7c198c88d5b6 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -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); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 3af8f044f180..bc1c3f908097 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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, |