Merge change 21492 into eclair

* changes:
  WifiService: Hash based on both SSID and BSSID in scan result cache.
This commit is contained in:
Android (Google) Code Review
2009-08-17 10:47:06 -07:00

View File

@@ -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 {