Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."

Browse Source 
am: d758ce1586

Change-Id: I1bf1effbb635d57980728555587e8056f630edb9
This commit is contained in:
Stephen Chen
2016-12-03 04:16:06 +00:00
committed by android-build-merger
parent 9625912b7f d758ce1586
commit d738140b8d
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -35260,6 +35260,7 @@ package android.provider {
field public static final int WIFI_SLEEP_POLICY_DEFAULT = 0; // 0x0 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 = 2; // 0x2
field public static final int WIFI_SLEEP_POLICY_NEVER_WHILE_PLUGGED = 1; // 0x1 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 WIFI_WATCHDOG_ON = "wifi_watchdog_on";
field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale"; field public static final java.lang.String WINDOW_ANIMATION_SCALE = "window_animation_scale";
} }

7
core/java/android/provider/Settings.java
View File

@@ -7644,6 +7644,13 @@ public final class Settings {
public static final String WIFI_SCAN_ALWAYS_AVAILABLE = public static final String WIFI_SCAN_ALWAYS_AVAILABLE =
"wifi_scan_always_enabled"; "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 * Settings to allow BLE scans to be enabled even when Bluetooth is turned off for
* connectivity. * connectivity.

1
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -51,6 +51,7 @@
<bool name="def_wifi_on">false</bool> <bool name="def_wifi_on">false</bool>
<!-- 0 == never, 1 == only when plugged in, 2 == always --> <!-- 0 == never, 1 == only when plugged in, 2 == always -->
<integer name="def_wifi_sleep_policy">2</integer> <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_networks_available_notification_on">true</bool>
<bool name="def_backup_enabled">false</bool> <bool name="def_backup_enabled">false</bool>