diff options
| author | Danesh M <daneshm90@gmail.com> | 2016-02-05 11:36:54 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2016-02-05 11:36:54 -0800 |
| commit | 326918c0b98309dab6a3598471d653a400f435f2 (patch) | |
| tree | 45591b39d2156b49aff970ab1deb4e7e6508bc5c /packages/SettingsProvider | |
| parent | faf68427a20c930acf5e2a1fda892eeeb21de43a (diff) | |
| download | frameworks_base-326918c0b98309dab6a3598471d653a400f435f2.zip frameworks_base-326918c0b98309dab6a3598471d653a400f435f2.tar.gz frameworks_base-326918c0b98309dab6a3598471d653a400f435f2.tar.bz2 | |
Revert "SettingsProvider : Make WIFI_IDLE_MS into an overlay"
This reverts commit faf68427a20c930acf5e2a1fda892eeeb21de43a.
Change-Id: Ia26899db93d22975147a29b99ff43b0ea0696d68
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 3 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 18 |
2 files changed, 1 insertions, 20 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 490618f..1346788 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -234,7 +234,4 @@ <!-- Default for Settings.Global.CAPTIVE_PORTAL_DETECTION_ENABLED --> <integer name="def_captive_portal_detection_enabled" translatable="false">1</integer> - - <!-- Default for Settings.Global.WIFI_IDLE_MS (15 minutes) --> - <integer name="default_wifi_idle_ms">900000</integer> </resources> 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. |