diff options
| author | 2016-12-02 23:41:36 +0000 | |
|---|---|---|
| committer | 2016-12-02 23:41:36 +0000 | |
| commit | d758ce1586dd8147a5bf96e58276859c1bdb1633 (patch) | |
| tree | 890987a668d023996a8ddbb6b38675cbb666bd9b | |
| parent | 46ec8dba83a1d0e2c2d1587daea13f5bce9bd237 (diff) | |
| parent | 8ca96c1f3c89181119919eaab3b81322d3988e66 (diff) | |
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 7 | ||||
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 01d4f47bdf33..9c41c32c0086 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -35104,6 +35104,7 @@ package android.provider { field public static final int WIFI_SLEEP_POLICY_DEFAULT = 0; // 0x0 field public static final int WIFI_SLEEP_POLICY_NEVER = 2; // 0x2 field public static final int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1 + field public static final java.lang.String WIFI_WAKEUP_ENABLED = "wifi_wakeup_enabled"; field public static final java.lang.String WIFI_WATCHDOG_ON = "wifi_watchdog_on"; field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale"; } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2f93afdc177d..326e9956696e 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7443,6 +7443,13 @@ public final class Settings { public static final String WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_scan_always_enabled"; + /** + * Value to specify if Wi-Fi Wakeup feature is enabled. + * @hide + */ + @SystemApi + public static final String WIFI_WAKEUP_ENABLED = "wifi_wakeup_enabled"; + /** * Settings to allow BLE scans to be enabled even when Bluetooth is turned off for * connectivity. diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 978ca9466ff1..f147a3b5c264 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -51,6 +51,7 @@ <bool name="def_wifi_on">false</bool> <!-- 0 == never, 1 == only when plugged in, 2 == always --> <integer name="def_wifi_sleep_policy">2</integer> + <bool name="def_wifi_wakeup_enabled">false</bool> <bool name="def_networks_available_notification_on">true</bool> <bool name="def_backup_enabled">false</bool> |