From 396864376695e984f40f1f41153169815c2e99f7 Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 24 Jul 2019 14:37:13 -0700 Subject: [PATCH] Removed WifiController deferred enable configurations Bug: 71559473 Test: Compiles Change-Id: Ifc19c9c8bc7c205fbfb13d18fc91b95eb2e42a75 --- core/java/android/provider/Settings.java | 6 ------ core/proto/android/providers/settings/global.proto | 4 ++-- .../coretests/src/android/provider/SettingsBackupTest.java | 1 - .../android/providers/settings/SettingsProtoDumpUtil.java | 3 --- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9abb64f15e996..4cff611032799 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11057,12 +11057,6 @@ public final class Settings { */ public static final String WIFI_P2P_DEVICE_NAME = "wifi_p2p_device_name"; - /** - * The min time between wifi disable and wifi enable - * @hide - */ - public static final String WIFI_REENABLE_DELAY_MS = "wifi_reenable_delay"; - /** * Timeout for ephemeral networks when all known BSSIDs go out of range. We will disconnect * from an ephemeral network if there is no BSSID for that network with a non-null score that diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 00706941a18f3..a2d5d2a66537d 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -1013,7 +1013,7 @@ message GlobalSettingsProto { optional SettingProto watchdog_poor_network_test_enabled = 22 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto suspend_optimizations_enabled = 23 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto verbose_logging_enabled = 24 [ (android.privacy).dest = DEST_AUTOMATIC ]; - reserved 25; // connected_mac_randomization_enabled + reserved 25; reserved "connected_mac_randomization_enabled"; optional SettingProto max_dhcp_retry_count = 26 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto mobile_data_transition_wakelock_timeout_ms = 27 [ (android.privacy).dest = DEST_AUTOMATIC ]; // Controls whether WiFi configurations created by a Device Owner app should @@ -1025,7 +1025,7 @@ message GlobalSettingsProto { optional SettingProto device_owner_configs_lockdown = 28 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto frequency_band = 29 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto p2p_device_name = 30; - optional SettingProto reenable_delay_ms = 31 [ (android.privacy).dest = DEST_AUTOMATIC ]; + reserved 31; reserved "reenable_delay_ms"; optional SettingProto ephemeral_out_of_range_timeout_ms = 32 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto on_when_proxy_disconnected = 33 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto bounce_delay_override_ms = 34 [ (android.privacy).dest = DEST_AUTOMATIC ]; diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index bdbf36881741e..8a2144448d0c4 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -544,7 +544,6 @@ public class SettingsBackupTest { Settings.Global.WIFI_ON, Settings.Global.WIFI_P2P_DEVICE_NAME, Settings.Global.WIFI_P2P_PENDING_FACTORY_RESET, - Settings.Global.WIFI_REENABLE_DELAY_MS, Settings.Global.WIFI_RTT_BACKGROUND_EXEC_GAP_MS, Settings.Global.WIFI_SAVED_STATE, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index a3b0e6be7a4f3..b7eddc2d773ae 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -1606,9 +1606,6 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Global.WIFI_P2P_DEVICE_NAME, GlobalSettingsProto.Wifi.P2P_DEVICE_NAME); - dumpSetting(s, p, - Settings.Global.WIFI_REENABLE_DELAY_MS, - GlobalSettingsProto.Wifi.REENABLE_DELAY_MS); dumpSetting(s, p, Settings.Global.WIFI_EPHEMERAL_OUT_OF_RANGE_TIMEOUT_MS, GlobalSettingsProto.Wifi.EPHEMERAL_OUT_OF_RANGE_TIMEOUT_MS);