Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd47012f authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 9dc2355b: Merge change 21492 into eclair 

Merge commit '9dc2355b'

* commit '9dc2355b':
  WifiService: Hash based on both SSID and BSSID in scan result cache.
parents 2b79ed83 9dc2355b

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

+4 −3
Original line number Diff line number Diff line
@@ -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 {