diff options
| author | 2022-10-05 08:31:17 +0000 | |
|---|---|---|
| committer | 2022-10-05 08:31:17 +0000 | |
| commit | 849c065ecfa4a9d07401fc939e002616b9244e09 (patch) | |
| tree | 58777c4adf61052c5d148155e72028ad9e10d564 | |
| parent | 69079b467d343d412b70859c3f41c0c309226af8 (diff) | |
| parent | 512495cf37177def5b3d916f206c7c445c545db5 (diff) | |
Merge "Do not back up brightness values - auto-brightness adjustment - deprecated VR brightness"
| -rw-r--r-- | packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java | 2 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java index f50168250c96..1a76943102b1 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java @@ -44,8 +44,6 @@ public class SystemSettings { Settings.System.DIM_SCREEN, Settings.System.SCREEN_OFF_TIMEOUT, Settings.System.SCREEN_BRIGHTNESS_MODE, - Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, - Settings.System.SCREEN_BRIGHTNESS_FOR_VR, Settings.System.ADAPTIVE_SLEEP, // moved to secure Settings.System.APPLY_RAMPING_RINGER, Settings.System.VIBRATE_INPUT_DEVICES, diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index b1979c905510..8f6924ced582 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -100,7 +100,9 @@ public class SettingsBackupTest { Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities Settings.System.PEAK_REFRESH_RATE, // depends on hardware capabilities Settings.System.SCREEN_BRIGHTNESS_FLOAT, + Settings.System.SCREEN_BRIGHTNESS_FOR_VR, Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT, + Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, Settings.System.MULTI_AUDIO_FOCUS_ENABLED // form-factor/OEM specific ); |