am 9dc2355b: Merge change 21492 into eclair

Merge commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8'

* commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8':
  WifiService: Hash based on both SSID and BSSID in scan result cache.

1 files changed, 4 insertions, 3 deletions

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index fae987a3af87..2dc747ea6914 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -1209,8 +1209,9 @@ public class WifiService extends IWifiManager.Stub {
                         ssid = "";
                     }
 
-                    // bssid is the hash key
-                    scanResult = mScanResultCache.get(bssid);
+                    // bssid + ssid is the hash key
+                    String key = bssid + ssid;
+                    scanResult = mScanResultCache.get(key);
                     if (scanResult != null) {
                         scanResult.level = level;
                         scanResult.SSID = ssid;
@@ -1222,7 +1223,7 @@ public class WifiService extends IWifiManager.Stub {
                             scanResult =
                                 new ScanResult(
                                     ssid, bssid, flags, level, frequency);
-                            mScanResultCache.put(bssid, scanResult);
+                            mScanResultCache.put(key, scanResult);
                         }
                     }
                 } else {