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

Commit d0963d18 authored by Jacky Cheung's avatar Jacky Cheung Committed by Android (Google) Code Review
Browse files

Merge "Add a configurable default value for MOBILE_DATA_ALWAYS_ON"

parents 6cf001e8 7076a31f

packages/SettingsProvider/res/values/defaults.xml

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


    <!-- Default for Settings.Secure.BACKUP_MANAGER_CONSTANTS -->

    <string name="def_backup_manager_constants"></string>



    <!-- Default setting for Settings.Global.MOBILE_DATA_ALWAYS_ON -->

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

</resources>

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

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



        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 149;

            private static final int SETTINGS_VERSION = 150;



            private final int mUserId;
@@ -3470,9 +3470,25 @@ public class SettingsProvider extends ContentProvider { 
                                    true, SettingsState.SYSTEM_PACKAGE_NAME);

                        }

                    }



                    currentVersion = 149;

                }



                if (currentVersion == 149) {

                    // Version 150: Set a default value for mobile data always on

                    final SettingsState globalSettings = getGlobalSettingsLocked();

                    final Setting currentSetting = globalSettings.getSettingLocked(

                            Settings.Global.MOBILE_DATA_ALWAYS_ON);

                    if (currentSetting.isNull()) {

                        globalSettings.insertSettingLocked(

                                Settings.Global.MOBILE_DATA_ALWAYS_ON,

                                getContext().getResources().getBoolean(

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

                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);

                    }



                    currentVersion = 150;

                }



                // vXXX: Add new settings above this point.



                if (currentVersion != newVersion) {