diff options
| author | 2017-10-30 18:38:48 -0700 | |
|---|---|---|
| committer | 2018-04-09 14:41:59 -0700 | |
| commit | 1269960d992d94c00a66197bf35a96060cdc1300 (patch) | |
| tree | 2af30518723949a71492343acd65693ebceec89d | |
| parent | 8aab7c65ec86b8473fa46e0f1b9f0a5e8b3aa7ff (diff) | |
Whitelist DISPLAY_COLOR_MODE setting for B&R
Bug: 68664032
Test: make -j100 && atest SettingsBackupTest && atest
SettingsValidatorsTest
Change-Id: I1d38acfcd3e6a0c228ae6891581b3218d4a67e6b
| -rw-r--r-- | core/java/android/provider/Settings.java | 6 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index b2a2c6020639..28ee61f8a641 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3113,6 +3113,9 @@ public final class Settings { */ public static final String DISPLAY_COLOR_MODE = "display_color_mode"; + private static final Validator DISPLAY_COLOR_MODE_VALIDATOR = + new SettingsValidators.InclusiveIntegerRangeValidator(0, 2); + /** * The amount of time in milliseconds before the device goes to sleep or begins * to dream after a period of inactivity. This value is also known as the @@ -4096,6 +4099,7 @@ public final class Settings { SHOW_BATTERY_PERCENT, NOTIFICATION_VIBRATION_INTENSITY, HAPTIC_FEEDBACK_INTENSITY, + DISPLAY_COLOR_MODE }; /** @@ -4208,6 +4212,7 @@ public final class Settings { PRIVATE_SETTINGS.add(LOCK_TO_APP_ENABLED); PRIVATE_SETTINGS.add(EGG_MODE); PRIVATE_SETTINGS.add(SHOW_BATTERY_PERCENT); + PRIVATE_SETTINGS.add(DISPLAY_COLOR_MODE); } /** @@ -4229,6 +4234,7 @@ public final class Settings { VALIDATORS.put(NEXT_ALARM_FORMATTED, NEXT_ALARM_FORMATTED_VALIDATOR); VALIDATORS.put(FONT_SCALE, FONT_SCALE_VALIDATOR); VALIDATORS.put(DIM_SCREEN, DIM_SCREEN_VALIDATOR); + VALIDATORS.put(DISPLAY_COLOR_MODE, DISPLAY_COLOR_MODE_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); diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index b1936b959816..0c49f122b0a9 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -60,7 +60,6 @@ public class SettingsBackupTest { Settings.System.ALARM_ALERT, // backup candidate? Settings.System.ALARM_ALERT_CACHE, // internal cache Settings.System.APPEND_FOR_LAST_AUDIBLE, // suffix deprecated since API 2 - Settings.System.DISPLAY_COLOR_MODE, // bug? Settings.System.EGG_MODE, // I am the lolrus Settings.System.END_BUTTON_BEHAVIOR, // bug? Settings.System |