Merge "Settings: Remove unused WIFI_SAVED_STATE" (cdd9f307) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -5215,7 +5215,6 @@ public final class Settings {
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_NUM_OPEN_NETWORKS_KEPT);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_ON);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_P2P_DEVICE_NAME);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SAVED_STATE);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED);
		MOVED_TO_GLOBAL.add(Settings.Global.WIFI_ENHANCED_AUTO_JOIN);
		@@ -10322,16 +10321,6 @@ public final class Settings {
		*/
		public static final String BLE_SCAN_BACKGROUND_MODE = "ble_scan_background_mode";

		/**
		* Used to save the Wifi_ON state prior to tethering.
		* This state will be checked to restore Wifi after
		* the user turns off tethering.
		*
		* @hide
		*/
		@UnsupportedAppUsage
		public static final String WIFI_SAVED_STATE = "wifi_saved_state";

		/**
		* The interval in milliseconds to scan as used by the wifi supplicant
		* @hide

+0 −3

Original line number	Diff line number	Diff line
		@@ -1562,9 +1562,6 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.WIFI_WAKEUP_ENABLED,
		GlobalSettingsProto.Wifi.WAKEUP_ENABLED);
		dumpSetting(s, p,
		Settings.Global.WIFI_SAVED_STATE,
		GlobalSettingsProto.Wifi.SAVED_STATE);
		dumpSetting(s, p,
		Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS,
		GlobalSettingsProto.Wifi.SUPPLICANT_SCAN_INTERVAL_MS);

+28 −1

Original line number	Diff line number	Diff line
		@@ -3415,7 +3415,7 @@ public class SettingsProvider extends ContentProvider {
		}

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 186;
		private static final int SETTINGS_VERSION = 187;

		private final int mUserId;

		@@ -4694,6 +4694,33 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 186;
		}

		if (currentVersion == 186) {
		// Remove unused wifi settings
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_rtt_background_exec_gap_ms");
		getGlobalSettingsLocked().deleteSettingLocked(
		"network_recommendation_request_timeout_ms");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_suspend_optimizations_enabled");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_is_unusable_event_metrics_enabled");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_data_stall_min_tx_bad");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_data_stall_min_tx_success_without_rx");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_link_speed_metrics_enabled");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_pno_frequency_culling_enabled");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_pno_recency_sorting_enabled");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_link_probing_enabled");
		getGlobalSettingsLocked().deleteSettingLocked(
		"wifi_saved_state");
		currentVersion = 187;
		}

		// vXXX: Add new settings above this point.

		if (currentVersion != newVersion) {

+0 −1

Original line number	Diff line number	Diff line
		@@ -543,7 +543,6 @@ public class SettingsBackupTest {
		Settings.Global.WIFI_ON,
		Settings.Global.WIFI_P2P_DEVICE_NAME,
		Settings.Global.WIFI_P2P_PENDING_FACTORY_RESET,
		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,