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

am 9dc2355b: Merge change 21492 into eclair

Browse Source 
Merge commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8'

* commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8':
  WifiService: Hash based on both SSID and BSSID in scan result cache.
This commit is contained in:
Mike Lockwood
2009-08-17 10:59:49 -07:00
committed by Android Git Automerger
parent 2b79ed839c 9dc2355b9b
commit cd47012ff3
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 = "";
}
// 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 {