From 02e56f9cdf978af75d22d4bd32ce918b9bbc0eae Mon Sep 17 00:00:00 2001 From: Tetiana Meronyk Date: Tue, 21 May 2024 17:41:57 +0000 Subject: Add B&R for Users settings preferences Bug: 314703394 Bug: 314702606 Bug: 314703594 Test: manual - switch preferences to opposite values, backup data, factory reset and restore data. Ensure the values are as set during backup. Change-Id: Ib87af10bb113eb03d321142c25c6de8265a63745 --- .../src/android/provider/settings/backup/GlobalSettings.java | 3 +++ .../android/provider/settings/validators/GlobalSettingsValidators.java | 3 +++ .../SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 3 --- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java index 8f8445d7a40b..3d52f6fa0d7d 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java @@ -120,5 +120,8 @@ public class GlobalSettings { Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_ENABLED, Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_TYPE, Settings.Global.Wearable.ACCESSIBILITY_VIBRATION_WATCH_SPEED, + Settings.Global.ADD_USERS_WHEN_LOCKED, + Settings.Global.REMOVE_GUEST_ON_EXIT, + Settings.Global.USER_SWITCHER_ENABLED, }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java index c274534c8d36..a1487ba1b685 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java @@ -450,5 +450,8 @@ public class GlobalSettingsValidators { Global.Wearable.CONSISTENT_NOTIFICATION_BLOCKING_ENABLED, ANY_INTEGER_VALIDATOR); VALIDATORS.put(Global.Wearable.AUTO_BEDTIME_MODE, BOOLEAN_VALIDATOR); VALIDATORS.put(Global.FORCE_ENABLE_PSS_PROFILING, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.ADD_USERS_WHEN_LOCKED, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.REMOVE_GUEST_ON_EXIT, BOOLEAN_VALIDATOR); + VALIDATORS.put(Global.USER_SWITCHER_ENABLED, BOOLEAN_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index ab9a30b65e08..f05f6b53afce 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -63,7 +63,6 @@ public class SettingsBackupTest { Settings.Global.ADB_ENABLED, Settings.Global.ADB_WIFI_ENABLED, Settings.Global.ADB_DISCONNECT_SESSIONS_ON_REVOKE, - Settings.Global.ADD_USERS_WHEN_LOCKED, Settings.Global.AIRPLANE_MODE_ON, Settings.Global.AIRPLANE_MODE_RADIOS, Settings.Global.ALLOW_WORK_PROFILE_TELEPHONY_FOR_NON_DPM_ROLE_HOLDERS, @@ -381,7 +380,6 @@ public class SettingsBackupTest { Settings.Global.RADIO_WIFI, Settings.Global.RADIO_WIMAX, Settings.Global.RADIO_UWB, - Settings.Global.REMOVE_GUEST_ON_EXIT, Settings.Global.RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS, Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT, Settings.Global.RESTRICTED_NETWORKING_MODE, @@ -485,7 +483,6 @@ public class SettingsBackupTest { Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT, Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS, - Settings.Global.USER_SWITCHER_ENABLED, Settings.Global.WARNING_TEMPERATURE, Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY, Settings.Global.WEBVIEW_MULTIPROCESS, -- cgit v1.2.3-59-g8ed1b