commit 9dc2355b9bdfdaadb72936b5ad865193a2af58c8
author Android (Google) Code Review <android-gerrit@google.com> Mon Aug 17 10:47:06 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 17 10:47:06 2009 -0700
tree f211ef4c5efcea9b30e6b193b32f0c4d15a3b1f5
parent 56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c
parent 00717e2d04cc2c273da9eae4d0dfe61621c7c08d

Merge change 21492 into eclair

* changes:
  WifiService: Hash based on both SSID and BSSID in scan result cache.

services/java/com/android/server/WifiService.java

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index fae987a..2dc747e 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -1209,8 +1209,9 @@
                         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 @@
                             scanResult =
                                 new ScanResult(
                                     ssid, bssid, flags, level, frequency);
-                            mScanResultCache.put(bssid, scanResult);
+                            mScanResultCache.put(key, scanResult);
                         }
                     }
                 } else {