diff options
| author | Damien Bargiacchi <drb@google.com> | 2018-05-15 20:58:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-15 20:58:31 +0000 |
| commit | 76fd7d57760502090b2a9fd28ed92232be30cdca (patch) | |
| tree | 60ade88e4cf4c4c78027de93c260c2d849eff54b /core/java/android | |
| parent | eddc0d712c06648bd3b330af92ea32c8192851e3 (diff) | |
| parent | 68bbaade77b3b8f0bcc308e385307f897c6e27e8 (diff) | |
Merge "Switch the setting for Off Body Radios Off to User Absent Radios Off" into pi-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 664442f29769..c05d8e4a5296 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10922,21 +10922,13 @@ 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. + * Whether or not to enable the User Absent, 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"; + public static final String USER_ABSENT_RADIOS_OFF_FOR_SMALL_BATTERY_ENABLED + = "user_absent_radios_off_for_small_battery_enabled"; /** * Whether or not to turn on Wifi when proxy is disconnected. |