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

Commit 936009fe authored by Antonino Faraone's avatar Antonino Faraone Committed by Android (Google) Code Review
Browse files

Merge "Add a configurable default value for WIFI_ALWAYS_REQUESTED" into main

parents c86f56be 16df2cee

packages/SettingsProvider/res/values/defaults.xml

+3 −0
Original line number Diff line number Diff line
@@ -324,4 +324,7 @@ 


    <!-- Whether predictive back animation is enabled by default. -->

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



    <!-- Whether wifi is always requested by default. -->

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

</resources>

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

+18 −1
Original line number Diff line number Diff line
@@ -3876,7 +3876,7 @@ public class SettingsProvider extends ContentProvider { 
        }



        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 221;

            private static final int SETTINGS_VERSION = 222;



            private final int mUserId;
@@ -5985,6 +5985,23 @@ public class SettingsProvider extends ContentProvider { 
                    currentVersion = 221;

                }



                if (currentVersion == 221) {

                    // Version 221: Set a default value for wifi always requested

                    final SettingsState globalSettings = getGlobalSettingsLocked();

                    final Setting enableWifiAlwaysRequested =

                            globalSettings.getSettingLocked(Global.WIFI_ALWAYS_REQUESTED);

                    if (enableWifiAlwaysRequested.isNull()) {

                        final boolean defEnableWifiAlwaysRequested =

                                getContext()

                                        .getResources()

                                        .getBoolean(R.bool.def_enable_wifi_always_requested);

                        initGlobalSettingsDefaultValLocked(

                                Settings.Global.WIFI_ALWAYS_REQUESTED,

                                defEnableWifiAlwaysRequested);

                    }

                    currentVersion = 222;

                }



                // vXXX: Add new settings above this point.



                if (currentVersion != newVersion) {