Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Remove unused bg scan throttle settings" into pi-dev

Browse Source 
am: f4f317798b

Change-Id: Ifb8dcd8b7d98bf427864651d5a80b4d2efbb3d77
This commit is contained in:
Roshan Pius
2018-03-20 02:31:23 +00:00
committed by android-build-merger
parent 90d17942e1 f4f317798b
commit 265efbd527
4 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/provider/Settings.java
View File

@@ -8789,21 +8789,6 @@ public final class Settings {
public static final String LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST =
"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)

2
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -447,8 +447,6 @@ public class SettingsBackupTest {
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,

6
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -268,12 +268,6 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p,
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);

12
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -2938,7 +2938,7 @@ public class SettingsProvider extends ContentProvider {
}
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 @@ public class SettingsProvider extends ContentProvider {
}
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) {