commit | 9c396677d9e7e6f290e80275626b1df712493bac | [log] [tgz] |
---|---|---|
author | Roshan Pius <rpius@google.com> | Fri Mar 02 14:54:13 2018 -0800 |
committer | Roshan Pius <rpius@google.com> | Mon Mar 19 10:39:18 2018 -0700 |
tree | 5296aeee700787a835cdebde2d1ff1c0a5db1835 | |
parent | 1b929db32d8e801a7cabbc7fb66915de73e23d34 [diff] [blame] |
Settings: Remove unused bg scan throttle settings Bug: 68987915 Test: Compiles Change-Id: I49b213f0d63f2a639e45c2239506787d31ae866a Merged-In: Id878daa0f782ddc751e726ee19cdc1c8e5ea1bc2
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index da62d94..5102cbd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2938,7 +2938,7 @@ } private final class UpgradeController { - private static final int SETTINGS_VERSION = 158; + private static final int SETTINGS_VERSION = 159; private final int mUserId; @@ -3636,6 +3636,16 @@ } currentVersion = 158; } + + if (currentVersion == 158) { + // Remove setting that specifies wifi bgscan throttling params + getGlobalSettingsLocked().deleteSettingLocked( + "wifi_scan_background_throttle_interval_ms"); + getGlobalSettingsLocked().deleteSettingLocked( + "wifi_scan_background_throttle_package_whitelist"); + currentVersion = 159; + } + // vXXX: Add new settings above this point. if (currentVersion != newVersion) {