Merge "Update statemachine for bssid change in supplicant" into jb-mr1-dev

Author: isheriff

wifi/java/android/net/wifi/WifiStateMachine.java

@@ -1613,10 +1613,7 @@ private SupplicantState handleSupplicantStateChange(Message message) {
             mWifiInfo.setNetworkId(WifiConfiguration.INVALID_NETWORK_ID);
         }
 
-        if (state == SupplicantState.ASSOCIATING) {
-            /* BSSID is valid only in ASSOCIATING state */
-            mWifiInfo.setBSSID(stateChangeResult.BSSID);
-        }
+        mWifiInfo.setBSSID(stateChangeResult.BSSID);
         mWifiInfo.setSSID(stateChangeResult.SSID);
 
         mSupplicantStateTracker.sendMessage(Message.obtain(message));