Merge "Settings: Add a setting to toggle wifi scan throttling" (94efa9cb) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -9823,6 +9823,18 @@ public final class Settings {
		public static final String RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS =
		"recommended_network_evaluator_cache_expiry_ms";

		/**
		* Whether wifi scan throttle is enabled or not.
		* This is intended to be used via adb commands or a menu in developer option to turn off
		* the default wifi scan throttling mechanism for apps.
		*
		* Type: int (0 for false, 1 for true)
		* @hide
		*/
		public static final String WIFI_SCAN_THROTTLE_ENABLED = "wifi_scan_throttle_enabled";

		private static final Validator WIFI_SCAN_THROTTLE_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Settings to allow BLE scans to be enabled even when Bluetooth is turned off for
		* connectivity.
		@@ -12315,6 +12327,7 @@ public final class Settings {
		VALIDATORS.put(SOFT_AP_TIMEOUT_ENABLED, SOFT_AP_TIMEOUT_ENABLED_VALIDATOR);
		VALIDATORS.put(WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON,
		WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR);
		VALIDATORS.put(WIFI_SCAN_THROTTLE_ENABLED, WIFI_SCAN_THROTTLE_ENABLED_VALIDATOR);
		VALIDATORS.put(APP_AUTO_RESTRICTION_ENABLED, APP_AUTO_RESTRICTION_ENABLED_VALIDATOR);
		VALIDATORS.put(ZEN_DURATION, ZEN_DURATION_VALIDATOR);
		VALIDATORS.put(CHARGING_VIBRATION_ENABLED, CHARGING_VIBRATION_ENABLED_VALIDATOR);

+1 −0

Original line number	Diff line number	Diff line
		@@ -484,6 +484,7 @@ public class SettingsBackupTest {
		Settings.Global.WIFI_SAVED_STATE,
		Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,
		Settings.Global.WIFI_SCAN_INTERVAL_WHEN_P2P_CONNECTED_MS,
		Settings.Global.WIFI_SCAN_THROTTLE_ENABLED,
		Settings.Global.WIFI_SCORE_PARAMS,
		Settings.Global.WIFI_SLEEP_POLICY,
		Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS,