diff options
| author | Xin Li <delphij@google.com> | 2020-10-09 11:14:30 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-10-10 20:38:57 -0700 |
| commit | 986e6eeddf02959975e63a7cd138e70784540bf6 (patch) | |
| tree | bf060846893c657436f9429650f2240f048dd0be /packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | |
| parent | 1015bae311220fe8242c33e58e11a932ed6f8a3a (diff) | |
| parent | 539d92beb7ed3638107c6d90c2f6a2e8a891256d (diff) | |
Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
Diffstat (limited to 'packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java')
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index b90b9c1208ae..bc1c3f908097 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -270,7 +270,6 @@ public class SettingsBackupTest { Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS, Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS, Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT, - Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, Settings.Global.ENHANCED_4G_MODE_ENABLED, Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES, Settings.Global.ERROR_LOGCAT_PREFIX, @@ -503,14 +502,14 @@ 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, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, - Settings.Global.GAME_DRIVER_BLACKLISTS, - Settings.Global.GAME_DRIVER_BLACKLIST, - Settings.Global.GAME_DRIVER_WHITELIST, + Settings.Global.GAME_DRIVER_DENYLISTS, + Settings.Global.GAME_DRIVER_DENYLIST, + Settings.Global.GAME_DRIVER_ALLOWLIST, Settings.Global.GAME_DRIVER_SPHAL_LIBRARIES, Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX, Settings.Global.GPU_DEBUG_LAYER_APP, |