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

Commit 473e5d58 authored by Minhyeok Yun's avatar Minhyeok Yun Committed by Android (Google) Code Review
Browse files

Merge "Set default value of def_auto_time_zone as false" into main

parents a302a178 2ac23c69

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

+13 −1
Original line number Diff line number Diff line
@@ -4254,7 +4254,7 @@ public class SettingsProvider extends ContentProvider { 


        @VisibleForTesting

        final class UpgradeController {

            private static final int SETTINGS_VERSION = 229;

            private static final int SETTINGS_VERSION = 230;



            private final int mUserId;

            private final int mDeviceId;
@@ -6573,6 +6573,18 @@ public class SettingsProvider extends ContentProvider { 
                    currentVersion = 229;

                }



                // Version 229: Migrate WearOS time zone settings for geo detection

                if (currentVersion == 229) {

                    if (getContext().getPackageManager()

                            .hasSystemFeature(PackageManager.FEATURE_WATCH)) {

                        SettingsState global = getGlobalSettingsLocked();

                        global.insertSettingLocked(Global.AUTO_TIME_ZONE, "0", null, true,

                                SettingsState.SYSTEM_PACKAGE_NAME);

                    }



                    currentVersion = 230;

                }



                // vXXX: Add new settings above this point.



                if (currentVersion != newVersion) {