From b6b0495af3f4c9cd6fda442c728478c1a6ac19f5 Mon Sep 17 00:00:00 2001 From: yuanlu Date: Tue, 20 Feb 2018 14:28:13 -0800 Subject: [PATCH] Add the flag for only alowing wifi on charger/network request option Bug: 72828389 Test: atest frameworks/base/core/tests/coretests/src/android/provider/SettingsBackupTest.java Change-Id: I137e9cf4b9d5d9760bf05139bd6ead5973b13724 --- core/java/android/provider/Settings.java | 9 +++++++++ .../tests/coretests/src/android/provider/SettingsBackupTest.java | 1 + 2 files changed, 10 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6fe249a2bfb0..3c3c76296187 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10617,6 +10617,15 @@ public final class Settings { public static final String OFF_BODY_RADIOS_OFF_DELAY_MS = "off_body_radios_off_delay_ms"; /** + * Whether or not to turn on Wifi when proxy is disconnected. + * Type: int (0 for false, 1 for true) + * Default: 1 + * @hide + */ + public static final String WIFI_ON_WHEN_PROXY_DISCONNECTED + = "wifi_on_when_proxy_disconnected"; + + /** * 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 d6580d6c78bc..6c72ac1d5fcb 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -231,6 +231,7 @@ public class SettingsBackupTest { Settings.Global.FORCE_ALLOW_ON_EXTERNAL, Settings.Global.FORCED_APP_STANDBY_ENABLED, Settings.Global.FORCED_APP_STANDBY_FOR_SMALL_BATTERY_ENABLED, + Settings.Global.WIFI_ON_WHEN_PROXY_DISCONNECTED, Settings.Global.FSTRIM_MANDATORY_INTERVAL, Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST, Settings.Global.GLOBAL_HTTP_PROXY_HOST, -- 2.11.0