am 6639dee4: am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"

# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '6639dee497304c359141caf9b0452699a6d64aa9':
  wifiSettings: Updating the networkinfo on supplicant event
This commit is contained in:
Irfan Sheriff
2013-02-06 09:02:26 -08:00
committed by Android Git Automerger

View File

@@ -814,6 +814,11 @@ public class WifiSettings extends SettingsPreferenceFragment
WifiManager.EXTRA_NEW_STATE);
if (!mConnected.get() && SupplicantState.isHandshakeState(state)) {
updateConnectionState(WifiInfo.getDetailedStateOf(state));
} else {
// During a connect, we may have the supplicant
// state change affect the detailed network state.
// Make sure a lost connection is updated as well.
updateConnectionState(null);
}
} else if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(action)) {
NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(