Merge "Reset & Stop updating WifiInfo outside ConnectMode" into oc-dev

am: bab957bb20

Change-Id: Ibe529ff8d35022a83d77ece12155cb2600b64bf2

1 files changed, 4 insertions, 5 deletions

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index d6ef5e870..cc35df2e6 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4432,10 +4432,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
                 case CMD_START_SCAN:
                     handleScanRequest(message);
                     break;
-                case WifiMonitor.SUPPLICANT_STATE_CHANGE_EVENT:
-                    SupplicantState state = handleSupplicantStateChange(message);
-                    if (mVerboseLoggingEnabled) log("SupplicantState= " + state);
-                    break;
                 default:
                     return NOT_HANDLED;
             }
@@ -4640,7 +4636,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
             if (!mWifiNative.removeAllNetworks()) {
                 loge("Failed to remove networks on entering connect mode");
             }
-
+            mWifiInfo.reset();
+            mWifiInfo.setSupplicantState(SupplicantState.DISCONNECTED);
             // Let the system know that wifi is available in client mode.
             setWifiState(WIFI_STATE_ENABLED);
 
@@ -4672,6 +4669,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
             if (!mWifiNative.removeAllNetworks()) {
                 loge("Failed to remove networks on exiting connect mode");
             }
+            mWifiInfo.reset();
+            mWifiInfo.setSupplicantState(SupplicantState.DISCONNECTED);
         }
 
         @Override