summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalla Kartheek <c_karthe@qti.qualcomm.com>2015-03-17 12:11:24 +0530
committerAragaoAnderson <andersonaragao@me.com>2015-04-11 21:30:30 -0300
commitf798334e7e1f031ca7d1da937cb3e105d5ce69e9 (patch)
treec4bbc0884ac52a0f7734e660f03ef60115f5248a
parent2caaed6bb73020faad5f656844ae093aa40f7a56 (diff)
downloadandroid_frameworks_opt_net_wifi-stable/cm-12.1-YOG3C.tar.gz
android_frameworks_opt_net_wifi-stable/cm-12.1-YOG3C.tar.bz2
android_frameworks_opt_net_wifi-stable/cm-12.1-YOG3C.zip
Wifi: Do not enable saved networks in ConnectedStatestable/cm-12.1-YOG3C
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
-rwxr-xr-xservice/java/com/android/server/wifi/WifiStateMachine.java7
1 files 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;
}