diff options
| author | Annie Meng <anniemeng@google.com> | 2018-04-05 18:49:52 +0100 |
|---|---|---|
| committer | Annie Meng <anniemeng@google.com> | 2018-04-06 12:48:23 +0000 |
| commit | aeeb24e9cd59e64722527671f68ecb7731a5ea19 (patch) | |
| tree | 2ae0aea0ec93853c12a4b602b4a4e717d7530add /core/java/android/provider/Settings.java | |
| parent | 977837acd69e74ec3149a48d90cfa3b01a7217b7 (diff) | |
Don't backup/restore screen brightness
We no longer want to backup and restore screen brightness as it could
leave the new device in an unusable state and doesn't make sense
cross-device.
Test: 1) atest SettingsBackupTest
2) atest SettingsValidatorsTest
3) Manual:
- Old backup set that has screen brightness does not restore with change
- Screen brightness does not backup or restore with change
Bug: 77583401
Merged-In: I8a6d950717e6aeb9bf6773c14708ee70069f9df0
Change-Id: I8a6d950717e6aeb9bf6773c14708ee70069f9df0
(cherry picked from commit 931b41b71a411dd714025970aeb752c71e86b239)
Diffstat (limited to 'core/java/android/provider/Settings.java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b2a2c6020639..1b80ecadedd5 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3133,9 +3133,6 @@ public final class Settings { */ public static final String SCREEN_BRIGHTNESS = "screen_brightness"; - private static final Validator SCREEN_BRIGHTNESS_VALIDATOR = - new SettingsValidators.InclusiveIntegerRangeValidator(0, 255); - /** * The screen backlight brightness between 0 and 255. * @hide @@ -4060,7 +4057,6 @@ public final class Settings { FONT_SCALE, DIM_SCREEN, SCREEN_OFF_TIMEOUT, - SCREEN_BRIGHTNESS, SCREEN_BRIGHTNESS_MODE, SCREEN_AUTO_BRIGHTNESS_ADJ, SCREEN_BRIGHTNESS_FOR_VR, @@ -4230,7 +4226,6 @@ public final class Settings { VALIDATORS.put(FONT_SCALE, FONT_SCALE_VALIDATOR); VALIDATORS.put(DIM_SCREEN, DIM_SCREEN_VALIDATOR); VALIDATORS.put(SCREEN_OFF_TIMEOUT, SCREEN_OFF_TIMEOUT_VALIDATOR); - VALIDATORS.put(SCREEN_BRIGHTNESS, SCREEN_BRIGHTNESS_VALIDATOR); VALIDATORS.put(SCREEN_BRIGHTNESS_FOR_VR, SCREEN_BRIGHTNESS_FOR_VR_VALIDATOR); VALIDATORS.put(SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_VALIDATOR); VALIDATORS.put(MODE_RINGER_STREAMS_AFFECTED, MODE_RINGER_STREAMS_AFFECTED_VALIDATOR); |