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

Commit 3350d715 authored by Edgar Wang's avatar Edgar Wang Committed by android-build-merger
Browse files

Merge "Set the default value for Secure Settings: AWARE_ENABLED" into qt-dev 

am: b962712d

Change-Id: I67c0afd97cc4dc1b0d05405395c1b96d1045d5a7
parents 8e290f64 b962712d

packages/SettingsProvider/res/values/defaults.xml

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


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

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



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

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

</resources>

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

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



        private final class UpgradeController {

            private static final int SETTINGS_VERSION = 177;

            private static final int SETTINGS_VERSION = 178;



            private final int mUserId;
@@ -4340,6 +4340,25 @@ public class SettingsProvider extends ContentProvider { 
                    currentVersion = 177;

                }



                if (currentVersion == 177) {

                    // Version 177: Set the default value for Secure Settings: AWARE_ENABLED



                    final SettingsState secureSettings = getSecureSettingsLocked(userId);



                    final Setting awareEnabled = secureSettings.getSettingLocked(

                            Secure.AWARE_ENABLED);



                    if (awareEnabled.isNull()) {

                        final boolean defAwareEnabled = getContext().getResources().getBoolean(

                                R.bool.def_aware_enabled);

                        secureSettings.insertSettingLocked(

                                Secure.AWARE_ENABLED, defAwareEnabled ? "1" : "0",

                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);

                    }



                    currentVersion = 178;

                }





                // vXXX: Add new settings above this point.