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

Commit 762c87d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a Settings value to store emegency thermal alert state" into main

parents 12f3dd35 185f0618

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -11575,6 +11575,15 @@ public final class Settings { 
        public static final String EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED =

                "extra_low_power_warning_acknowledged";













        /**













         * Whether the emergency thermal alert would be disabled













         * (0: default) or not (1).













         *













         * @hide













         */













        public static final String EMERGENCY_THERMAL_ALERT_DISABLED =













                "emergency_thermal_alert_disabled";



























        /**















         * 0 (default) Auto battery saver suggestion has not been suppressed. 1) it has been















         * suppressed.

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -154,6 +154,7 @@ public class SecureSettings {













        Settings.Secure.MANUAL_RINGER_TOGGLE_COUNT,















        Settings.Secure.LOW_POWER_WARNING_ACKNOWLEDGED,















        Settings.Secure.EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED,













        Settings.Secure.EMERGENCY_THERMAL_ALERT_DISABLED,















        Settings.Secure.HUSH_GESTURE_USED,















        Settings.Secure.IN_CALL_NOTIFICATION_ENABLED,















        Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,

































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -235,6 +235,7 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.MANUAL_RINGER_TOGGLE_COUNT, NON_NEGATIVE_INTEGER_VALIDATOR);















        VALIDATORS.put(Secure.LOW_POWER_WARNING_ACKNOWLEDGED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.EMERGENCY_THERMAL_ALERT_DISABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.IN_CALL_NOTIFICATION_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, BOOLEAN_VALIDATOR);