Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4d7d45d authored by Stephen Chen's avatar Stephen Chen Committed by android-build-merger
Browse files

Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce15 

am: d738140b

Change-Id: Icb8eb81b2021ee12eccd9158974353120228e7c0
parents 434e16c7 d738140b

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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_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";

  }

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -7650,6 +7650,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.

packages/SettingsProvider/res/values/defaults.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>