diff options
| author | 2024-03-12 16:21:31 +0000 | |
|---|---|---|
| committer | 2024-03-12 16:21:31 +0000 | |
| commit | cf08cb3a15b8c0d3d9d3361a477b8d8cf94e4d78 (patch) | |
| tree | 071c94f31e547b82fed526b391dbfa9c65a00be3 | |
| parent | f17d90d41bfd348acaf8c11c936c09015a5cf25e (diff) | |
| parent | 28d5a8f8b4378a72da7bc738bafcf126bf7c1999 (diff) | |
Merge "Backup and restore audio device inventory settings" into main
3 files changed, 3 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index 30d5d4b86a90..eaec617cfa70 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -269,6 +269,7 @@ public class SecureSettings { Settings.Secure.STYLUS_POINTER_ICON_ENABLED, Settings.Secure.CAMERA_EXTENSIONS_FALLBACK, Settings.Secure.VISUAL_QUERY_ACCESSIBILITY_DETECTION_ENABLED, - Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS + Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS, + Settings.Secure.AUDIO_DEVICE_INVENTORY }; } diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 893932f663b7..046d6e25ff31 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -424,5 +424,6 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.STYLUS_POINTER_ICON_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.CAMERA_EXTENSIONS_FALLBACK, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.IMMERSIVE_MODE_CONFIRMATIONS, ANY_STRING_VALIDATOR); + VALIDATORS.put(Secure.AUDIO_DEVICE_INVENTORY, ANY_STRING_VALIDATOR); } } diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 46c89900b54e..6eb2dd043c94 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -670,7 +670,6 @@ public class SettingsBackupTest { Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY, - Settings.Secure.AUDIO_DEVICE_INVENTORY, // not controllable by user Settings.Secure.AUDIO_SAFE_CSD_AS_A_FEATURE_ENABLED, // not controllable by user Settings.Secure.BACKUP_AUTO_RESTORE, Settings.Secure.BACKUP_ENABLED, |