Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1269960d authored by Christine Franks's avatar Christine Franks
Browse files

Whitelist DISPLAY_COLOR_MODE setting for B&R 

Bug: 68664032
Test: make -j100 && atest SettingsBackupTest && atest
SettingsValidatorsTest
Change-Id: I1d38acfcd3e6a0c228ae6891581b3218d4a67e6b
parent 8aab7c65

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -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);

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −1
Original line number Diff line number Diff line
@@ -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