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

Commit 0d8d81b1 authored by Vadym Omelnytskyi's avatar Vadym Omelnytskyi Committed by Android (Google) Code Review
Browse files

Merge "Settings: add system setting CV_ENABLED" into main

parents e79b4fc3 94d1499f

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -6483,6 +6483,14 @@ public final class Settings { 
         */

        public static final String SCREEN_FLASH_NOTIFICATION = "screen_flash_notification";













        /**













         * Setting to enable CV (proprietary)













         *













         * @hide













         */













        public static final String CV_ENABLED =













                "cv_enabled";



























        /**















         * Integer property that specifes the color for screen flash notification as a















         * packed 32-bit color.

































core/proto/android/providers/settings/system.proto



+10
−1




























Original line number
Diff line number
Diff line








@@ -290,7 +290,16 @@ message SystemSettingsProto {





























    optional SettingProto apply_ramping_ringer = 35 [ (android.privacy).dest = DEST_AUTOMATIC ];





























    message Display {













        option (android.msg_privacy).dest = DEST_EXPLICIT;



























        optional SettingProto cv_enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];













    }













    optional Display display = 39;

























































    // Please insert fields in alphabetical order and group them into messages















    // if possible (to avoid reaching the method limit).













    // Next tag = 39;













    // Next tag = 40;















}
























packages/SettingsProvider/src/android/provider/settings/backup/SystemSettings.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -124,7 +124,8 @@ public class SystemSettings {













                Settings.System.NOTIFICATION_COOLDOWN_ENABLED,















                Settings.System.NOTIFICATION_COOLDOWN_ALL,















                Settings.System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED,













                Settings.System.PREFERRED_REGION













                Settings.System.PREFERRED_REGION,













                Settings.System.CV_ENABLED















        ));















        if (Flags.backUpSmoothDisplayAndForcePeakRefreshRate()) {















            settings.add(Settings.System.PEAK_REFRESH_RATE);

































packages/SettingsProvider/src/android/provider/settings/validators/SystemSettingsValidators.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -271,5 +271,7 @@ public class SystemSettingsValidators {













        VALIDATORS.put(System.NOTIFICATION_COOLDOWN_ALL, BOOLEAN_VALIDATOR);















        VALIDATORS.put(System.NOTIFICATION_COOLDOWN_VIBRATE_UNLOCKED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(System.PREFERRED_REGION, ANY_STRING_VALIDATOR);













        VALIDATORS.put(System.CV_ENABLED,













                new InclusiveIntegerRangeValidator(0, 1));















    }















}
























packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -3157,6 +3157,12 @@ class SettingsProtoDumpUtil {













                SystemSettingsProto.Volume.MASTER_BALANCE);















        p.end(volumeToken);





























        final long systemDisplayToken = p.start(SystemSettingsProto.DISPLAY);













        dumpSetting(s, p,













                Settings.System.CV_ENABLED,













                SystemSettingsProto.Display.CV_ENABLED);













        p.end(systemDisplayToken);





























        dumpSetting(s, p,















                Settings.System.WHEN_TO_MAKE_WIFI_CALLS,















                SystemSettingsProto.WHEN_TO_MAKE_WIFI_CALLS);