Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce1586 am: d738140b8d am: a4d7d45df9

am: 50905a474f Change-Id: Idc7bc3e35343b06adebb035cc00b555db54289c5
2016-12-03 04:35:19 +00:00
parent 39287e3d76 50905a474f
commit c837ebb2c1
3 changed files with 9 additions and 0 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7741,6 +7741,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.