drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE

Browse Source 
* commit '9a7376396ccd272d4be429373e06ae64fe096380':
  Clear network id when invalid
This commit is contained in:
Irfan Sheriff
2011-05-23 22:33:33 -07:00
committed by Android Git Automerger
parent c41a17de2b 9a7376396c
commit c2ff0e7031
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wifi/java/android/net/wifi/WifiStateMachine.java
View File

@ -481,7 +481,7 @@ public class WifiStateMachine extends StateMachine {
mNetworkInfo.setIsAvailable(false); mNetworkInfo.setIsAvailable(false);
mLinkProperties.clear(); mLinkProperties.clear();
mLastBssid = null; mLastBssid = null;
mLastNetworkId = -1; mLastNetworkId = WifiConfiguration.INVALID_NETWORK_ID;
mLastSignalLevel = -1; mLastSignalLevel = -1;
mAlarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE); mAlarmManager = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
@ -821,11 +821,12 @@ public class WifiStateMachine extends StateMachine {
} }
public void connectNetwork(WifiConfiguration wifiConfig) { public void connectNetwork(WifiConfiguration wifiConfig) {
/* arg1 is used to indicate netId, force a netId value of -1 when /* arg1 is used to indicate netId, force a netId value of
* we are passing a configuration since the default value of * WifiConfiguration.INVALID_NETWORK_ID when we are passing
* 0 is a valid netId * a configuration since the default value of 0 is a valid netId
*/ */
sendMessage(obtainMessage(CMD_CONNECT_NETWORK, -1, 0, wifiConfig)); sendMessage(obtainMessage(CMD_CONNECT_NETWORK, WifiConfiguration.INVALID_NETWORK_ID,
0, wifiConfig));
} }
public void saveNetwork(WifiConfiguration wifiConfig) { public void saveNetwork(WifiConfiguration wifiConfig) {
@ -1429,7 +1430,7 @@ public class WifiStateMachine extends StateMachine {
mWifiInfo.setInetAddress(null); mWifiInfo.setInetAddress(null);
mWifiInfo.setBSSID(null); mWifiInfo.setBSSID(null);
mWifiInfo.setSSID(null); mWifiInfo.setSSID(null);
mWifiInfo.setNetworkId(-1); mWifiInfo.setNetworkId(WifiConfiguration.INVALID_NETWORK_ID);
mWifiInfo.setRssi(MIN_RSSI); mWifiInfo.setRssi(MIN_RSSI);
mWifiInfo.setLinkSpeed(-1); mWifiInfo.setLinkSpeed(-1);
@ -1441,7 +1442,7 @@ public class WifiStateMachine extends StateMachine {
mLinkProperties.clear(); mLinkProperties.clear();
mLastBssid= null; mLastBssid= null;
mLastNetworkId = -1; mLastNetworkId = WifiConfiguration.INVALID_NETWORK_ID;
} }
@ -2034,7 +2035,7 @@ public class WifiStateMachine extends StateMachine {
mWpsStateMachine.sendMessage(CMD_RESET_WPS_STATE); mWpsStateMachine.sendMessage(CMD_RESET_WPS_STATE);
/* Initialize data structures */ /* Initialize data structures */
mLastBssid = null; mLastBssid = null;
mLastNetworkId = -1; mLastNetworkId = WifiConfiguration.INVALID_NETWORK_ID;
mLastSignalLevel = -1; mLastSignalLevel = -1;
mWifiInfo.setMacAddress(WifiNative.getMacAddressCommand()); mWifiInfo.setMacAddress(WifiNative.getMacAddressCommand());
@ -2524,7 +2525,10 @@ public class WifiStateMachine extends StateMachine {
// Network id is only valid when we start connecting // Network id is only valid when we start connecting
if (SupplicantState.isConnecting(state)) { if (SupplicantState.isConnecting(state)) {
mWifiInfo.setNetworkId(stateChangeResult.networkId); mWifiInfo.setNetworkId(stateChangeResult.networkId);
} else {
mWifiInfo.setNetworkId(WifiConfiguration.INVALID_NETWORK_ID);
} }
if (state == SupplicantState.ASSOCIATING) { if (state == SupplicantState.ASSOCIATING) {
/* BSSID is valid only in ASSOCIATING state */ /* BSSID is valid only in ASSOCIATING state */
mWifiInfo.setBSSID(stateChangeResult.BSSID); mWifiInfo.setBSSID(stateChangeResult.BSSID);