Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 21492 into eclair

Browse Source 
* 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
parent 56e7ba2928 00717e2d04
commit 9dc2355b9b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/WifiService.java
View File

@@ -1209,8 +1209,9 @@ public class WifiService extends IWifiManager.Stub {
ssid = ""; ssid = "";
} }
// bssid is the hash key // bssid + ssid is the hash key
scanResult = mScanResultCache.get(bssid); String key = bssid + ssid;
scanResult = mScanResultCache.get(key);
if (scanResult != null) { if (scanResult != null) {
scanResult.level = level; scanResult.level = level;
scanResult.SSID = ssid; scanResult.SSID = ssid;
@@ -1222,7 +1223,7 @@ public class WifiService extends IWifiManager.Stub {
scanResult = scanResult =
new ScanResult( new ScanResult(
ssid, bssid, flags, level, frequency); ssid, bssid, flags, level, frequency);
mScanResultCache.put(bssid, scanResult); mScanResultCache.put(key, scanResult);
} }
} }
} else { } else {