From 50b611070fed444d9826ff44d8f840b7be81f225 Mon Sep 17 00:00:00 2001 From: Damien Bargiacchi Date: Thu, 15 Feb 2018 16:45:37 -0800 Subject: [PATCH] Add setting for off body, radio off feature Bug: 72714112 Change-Id: I8a632983c6c60ae195afa5bd6bdb677719bc5044 --- core/java/android/provider/Settings.java | 17 +++++++++++++++++ .../src/android/provider/SettingsBackupTest.java | 2 ++ 2 files changed, 19 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 569a0db768aa..781a5f868abe 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10593,6 +10593,23 @@ public final class Settings { = "forced_app_standby_for_small_battery_enabled"; /** + * Whether or not to enable the Off Body, Radios Off feature on small battery devices. + * Type: int (0 for false, 1 for true) + * Default: 0 + * @hide + */ + public static final String OFF_BODY_RADIOS_OFF_FOR_SMALL_BATTERY_ENABLED + = "off_body_radios_off_for_small_battery_enabled"; + + /** + * How long after the device goes off body to disable radios, in milliseconds. + * Type: long + * Default: 10 minutes + * @hide + */ + public static final String OFF_BODY_RADIOS_OFF_DELAY_MS = "off_body_radios_off_delay_ms"; + + /** * Whether or not to enable Time Only Mode for watch type devices. * Type: int (0 for false, 1 for true) * Default: 0 diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index f4d4c444da9b..d6580d6c78bc 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -314,6 +314,8 @@ public class SettingsBackupTest { Settings.Global.NTP_SERVER, Settings.Global.NTP_TIMEOUT, Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, + Settings.Global.OFF_BODY_RADIOS_OFF_FOR_SMALL_BATTERY_ENABLED, + Settings.Global.OFF_BODY_RADIOS_OFF_DELAY_MS, Settings.Global.OVERLAY_DISPLAY_DEVICES, Settings.Global.PAC_CHANGE_DELAY, Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE, -- 2.11.0