From f798334e7e1f031ca7d1da937cb3e105d5ce69e9 Mon Sep 17 00:00:00 2001 From: Nalla Kartheek Date: Tue, 17 Mar 2015 12:11:24 +0530 Subject: Wifi: Do not enable saved networks in ConnectedState Since Wi-Fi Framework takes control over wpa_supplicant for network selection, there is no point to enable all the networks in the supplicant as this would end up in supplicant connect to other networks than the one selected by the framework. Change-Id: Ie691a4aa4e446363d6e2e6482956fca83eb7b183 CRs-Fixed: 800685 --- service/java/com/android/server/wifi/WifiStateMachine.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index c921925ea..4676be268 100755 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -7849,9 +7849,10 @@ public class WifiStateMachine extends StateMachine { sendMessageDelayed(obtainMessage(CMD_TEST_NETWORK_DISCONNECT, testNetworkDisconnectCounter, 0), 15000); } - - // Reenable all networks, allow for hidden networks to be scanned - mWifiConfigStore.enableAllNetworks(); + if (!mWifiConfigStore.enableAutoJoinWhenAssociated) { + // Reenable all networks, allow for hidden networks to be scanned + mWifiConfigStore.enableAllNetworks(); + } mLastDriverRoamAttempt = 0; } -- cgit v1.2.3