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

Commit 1af846b9 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 5376 

* changes:
  WifiService: Update all scan result values in our scan result cache.
parents 94e94210 1a645058

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

+31 −28
Original line number Diff line number Diff line
@@ -1349,11 +1349,6 @@ public class WifiService extends IWifiManager.Stub { 
                        level = 0;

                    }



                    // bssid is the hash key

                    scanResult = mScanResultCache.get(bssid);

                    if (scanResult != null) {

                        scanResult.level = level;

                    } else {

                    /*

                     * The formatting of the results returned by

                     * wpa_supplicant is intended to make the fields
@@ -1382,6 +1377,14 @@ public class WifiService extends IWifiManager.Stub { 
                        ssid = "";

                    }



                    // bssid is the hash key

                    scanResult = mScanResultCache.get(bssid);

                    if (scanResult != null) {

                        scanResult.level = level;

                        scanResult.SSID = ssid;

                        scanResult.capabilities = flags;

                        scanResult.frequency = frequency;

                    } else {

                        // Do not add scan results that have no SSID set

                        if (0 < ssid.trim().length()) {

                            scanResult =