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

Commit f4764351 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add USB_ALARM_TEMPERATURE in SettingsProvider"

parents 8d2cfac2 495b657b

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -13510,6 +13510,13 @@ public final class Settings { 
         */

        public static final String WARNING_TEMPERATURE = "warning_temperature";

























        /**













         * USB Temperature at which the high temperature alarm notification should be shown.













         * @hide













         */













        public static final String USB_ALARM_TEMPERATURE = "usb_alarm_temperature";



























        /**















         * Whether the diskstats logging task is enabled/disabled.















         * @hide

























core/proto/android/providers/settings/global.proto



+2
−0




























Original line number
Diff line number
Diff line








@@ -869,6 +869,8 @@ message GlobalSettingsProto {













        // Temperature at which the high temperature warning notification should















        // be shown.















        optional SettingProto warning_temperature_level = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];













        // USB temperature at which the high temperature alarm notification should be shown.













        optional SettingProto usb_alarm_temperature_level = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];















    }















    optional TemperatureWarning temperature_warning = 119;

















































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



+1
−0




























Original line number
Diff line number
Diff line








@@ -477,6 +477,7 @@ public class SettingsBackupTest {













                    Settings.Global.USER_SWITCHER_ENABLED,















                    Settings.Global.NETWORK_ACCESS_TIMEOUT_MS,















                    Settings.Global.WARNING_TEMPERATURE,













                    Settings.Global.USB_ALARM_TEMPERATURE,















                    Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY,















                    Settings.Global.WEBVIEW_FALLBACK_LOGIC_ENABLED,















                    Settings.Global.WEBVIEW_MULTIPROCESS,

































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



+3
−0




























Original line number
Diff line number
Diff line








@@ -1306,6 +1306,9 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.WARNING_TEMPERATURE,















                GlobalSettingsProto.TemperatureWarning.WARNING_TEMPERATURE_LEVEL);













        dumpSetting(s, p,













                Settings.Global.USB_ALARM_TEMPERATURE,













                GlobalSettingsProto.TemperatureWarning.USB_ALARM_TEMPERATURE_LEVEL);















        p.end(tempWarningToken);































        final long tetherToken = p.start(GlobalSettingsProto.TETHER);