Merge "Make auto-rotate pref not reset on upgrade" into pi-dev

am: b5dac6f63a Change-Id: Ib391b9e4374d67a4701c982ac4e0b0ec0169780d
2018-05-17 09:16:29 -07:00
parent 69820609b7 b5dac6f63a
commit 4850a47ad7
1 changed files with 1 additions and 8 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3522,14 +3522,7 @@ public class SettingsProvider extends ContentProvider {
                }

                if (currentVersion == 150) {
-                    // Version 151: Reset rotate locked setting for upgrading users
-                    final SettingsState systemSettings = getSystemSettingsLocked(userId);
-                    systemSettings.insertSettingLocked(
-                            Settings.System.ACCELEROMETER_ROTATION,
-                            getContext().getResources().getBoolean(
-                                    R.bool.def_accelerometer_rotation) ? "1" : "0",
-                            null, true, SettingsState.SYSTEM_PACKAGE_NAME);
-
+                    // Version 151: Removed.
                    currentVersion = 151;
                }