commit 4cd0f1191b347df8cf0a550bcfd710c9c7c2bc13
author Irfan Sheriff <isheriff@android.com> Wed Feb 06 09:02:26 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 06 09:02:26 2013 -0800
tree 460bfe084fafb6e29e8489e5ded3d7598c235760
parent 2ae050796a43dc6afe9dbc6c045df4cdd81dce25
parent 6639dee497304c359141caf9b0452699a6d64aa9

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

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 60f89b7..82b7000 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -814,7 +814,12 @@
                     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(
                     WifiManager.EXTRA_NETWORK_INFO);