Settings: Remove unused bg scan throttle settings
Bug: 68987915
Test: Compiles
Change-Id: I49b213f0d63f2a639e45c2239506787d31ae866a
Merged-In: Id878daa0f782ddc751e726ee19cdc1c8e5ea1bc2
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 70615c8..1a97b5d 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8753,21 +8753,6 @@
"location_background_throttle_package_whitelist";
/**
- * The interval in milliseconds at which wifi scan requests will be throttled when they are
- * coming from the background.
- * @hide
- */
- public static final String WIFI_SCAN_BACKGROUND_THROTTLE_INTERVAL_MS =
- "wifi_scan_background_throttle_interval_ms";
-
- /**
- * Packages that are whitelisted to be exempt for wifi background throttling.
- * @hide
- */
- public static final String WIFI_SCAN_BACKGROUND_THROTTLE_PACKAGE_WHITELIST =
- "wifi_scan_background_throttle_package_whitelist";
-
- /**
* Whether TV will switch to MHL port when a mobile device is plugged in.
* (0 = false, 1 = true)
* @hide
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 04cdb0b..1d9968c 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -445,8 +445,6 @@
Settings.Global.WIFI_REENABLE_DELAY_MS,
Settings.Global.WIFI_SAVED_STATE,
Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,
- Settings.Global.WIFI_SCAN_BACKGROUND_THROTTLE_INTERVAL_MS,
- Settings.Global.WIFI_SCAN_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,
Settings.Global.WIFI_SCAN_INTERVAL_WHEN_P2P_CONNECTED_MS,
Settings.Global.WIFI_SLEEP_POLICY,
Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS,
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index c286881..f895a98 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -269,12 +269,6 @@
Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,
GlobalSettingsProto.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST);
dumpSetting(s, p,
- Settings.Global.WIFI_SCAN_BACKGROUND_THROTTLE_INTERVAL_MS,
- GlobalSettingsProto.WIFI_SCAN_BACKGROUND_THROTTLE_INTERVAL_MS);
- dumpSetting(s, p,
- Settings.Global.WIFI_SCAN_BACKGROUND_THROTTLE_PACKAGE_WHITELIST,
- GlobalSettingsProto.WIFI_SCAN_BACKGROUND_THROTTLE_PACKAGE_WHITELIST);
- dumpSetting(s, p,
Settings.Global.MHL_INPUT_SWITCHING_ENABLED,
GlobalSettingsProto.MHL_INPUT_SWITCHING_ENABLED);
dumpSetting(s, p,
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) {