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

Commit 98e4ae9f authored by Stephen Chen's avatar Stephen Chen Committed by Android (Google) Code Review
Browse files

Merge "Enable Wifi Wakeup Setting by default."

parents 51707a97 abb947ac

packages/SettingsProvider/res/values/defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +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_wifi_wakeup_enabled">true</bool>

    <bool name="def_networks_available_notification_on">true</bool>



    <bool name="def_backup_enabled">false</bool>

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+18 −0
Original line number Diff line number Diff line
@@ -3343,6 +3343,24 @@ public class SettingsProvider extends ContentProvider { 
                    currentVersion = 142;

                }



                if (currentVersion == 142) {

                    // Version 142: Set a default value for Wi-Fi wakeup feature.

                    if (userId == UserHandle.USER_SYSTEM) {

                        final SettingsState globalSettings = getGlobalSettingsLocked();

                        Setting currentSetting = globalSettings.getSettingLocked(

                                Settings.Global.WIFI_WAKEUP_ENABLED);

                        if (currentSetting.isNull()) {

                            globalSettings.insertSettingLocked(

                                    Settings.Global.WIFI_WAKEUP_ENABLED,

                                    getContext().getResources().getBoolean(

                                            R.bool.def_wifi_wakeup_enabled) ? "1" : "0",

                                    null, true, SettingsState.SYSTEM_PACKAGE_NAME);

                        }

                    }



                    currentVersion = 143;

                }



                if (currentVersion != newVersion) {

                    Slog.wtf("SettingsProvider", "warning: upgrading settings database to version "

                            + newVersion + " left it at "