diff options
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 66d0d8c..f55cead 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1986,7 +1986,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 123; + private static final int SETTINGS_VERSION = 122; /** * This is the 12.1 database version (DO NOT INCREMENT) */ @@ -2170,22 +2170,6 @@ public class SettingsProvider extends ContentProvider { } currentVersion = 122; } - - if (currentVersion == 122) { - if (userId == UserHandle.USER_OWNER) { - final SettingsState globalSettings = getGlobalSettingsLocked(); - Setting currentSetting = globalSettings.getSettingLocked( - Settings.Global.WIFI_IDLE_MS); - int defaultComponent = getContext().getResources().getInteger( - R.integer.default_wifi_idle_ms); - if (currentSetting == null) { - globalSettings.insertSettingLocked(Settings.Global.WIFI_IDLE_MS, - Integer.toString(defaultComponent), - SettingsState.SYSTEM_PACKAGE_NAME); - } - } - currentVersion = 123; - } // vXXX: Add new settings above this point. // Return the current version. |