commit ada2f7e17bf7032ba0ab06c80713c0720711ac4b
author Vinit Deshapnde <vinitd@google.com> Tue Jul 09 19:20:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 09 19:20:24 2013 +0000
tree a71d707aca9f0a77a4a458125b5eef1e188cc21f
parent 235e817c80e0a2563952bdb4f58a29085758ac55
parent b8d116a580000f8c3f162da11a49b1bdc3705d97

Merge "Flush scan results et al after band change"

wifi/java/android/net/wifi/WifiNative.java

diff --git a/wifi/java/android/net/wifi/WifiNative.java b/wifi/java/android/net/wifi/WifiNative.java
index 375a160..ae41c9a 100644
--- a/wifi/java/android/net/wifi/WifiNative.java
+++ b/wifi/java/android/net/wifi/WifiNative.java
@@ -388,6 +388,10 @@
         return doStringCommand("PKTCNT_POLL");
     }
 
+    public void bssFlush() {
+        doBooleanCommand("BSS_FLUSH");
+    }
+
     public boolean startWpsPbc(String bssid) {
         if (TextUtils.isEmpty(bssid)) {
             return doBooleanCommand("WPS_PBC");

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

diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 1f51b2a..d509b37 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2497,6 +2497,8 @@
                     if (DBG) log("set frequency band " + band);
                     if (mWifiNative.setBand(band)) {
                         mFrequencyBand.set(band);
+                        // flush old data - like scan results
+                        mWifiNative.bssFlush();
                         //Fetch the latest scan results when frequency band is set
                         startScanNative(WifiNative.SCAN_WITH_CONNECTION_SETUP);
                     } else {