commit 179d479d047c22d94d1db53980156986b0dba710
author Randy Pan <zpan@google.com> Mon Jul 18 13:58:14 2016 -0700
committer Randy Pan <zpan@google.com> Mon Jul 18 14:34:07 2016 -0700
tree e920b21ca2d106021036921168ea8656ecedf366
parent 62a41b4a43cba3fad221291533c145863b7001f0

WCM: reset last connection BSSID

Reset WCM's record of last connection attempt BSSID when WiFi
is disconnected or WiFi/WCM is disabled.

Bug: 30140653
Tests: WiFi framework unit tests & manual tests
Change-Id: I70b285ffcc8783db587b3fcc14f8f85ffa6122f2

service/java/com/android/server/wifi/WifiConnectivityManager.java

diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index 7e54c33..7f3d5d7 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -1034,8 +1034,10 @@
 
         mWifiState = state;
 
-        // Kick off the watchdog timer if entering disconnected state
+        // Reset BSSID of last connection attempt and kick off
+        // the watchdog timer if entering disconnected state.
         if (mWifiState == WIFI_STATE_DISCONNECTED) {
+            mLastConnectionAttemptBssid = null;
             scheduleWatchdogTimer();
         }
 
@@ -1115,6 +1117,7 @@
         if (!mWifiEnabled) {
             stopConnectivityScan();
             resetLastPeriodicSingleScanTimeStamp();
+            mLastConnectionAttemptBssid = null;
         }
     }
 
@@ -1129,6 +1132,7 @@
         if (!mWifiConnectivityManagerEnabled) {
             stopConnectivityScan();
             resetLastPeriodicSingleScanTimeStamp();
+            mLastConnectionAttemptBssid = null;
         }
     }