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

Commit ec4bb0c2 authored by Quang Luong's avatar Quang Luong
Browse files

Prioritize Passpoint home network over roaming network in wifi picker 

Displayed RSSI and SSID to connect to for a Passpoint credential
network will correspond to the strongest home network by RSSI, or if
no home networks are available, then the strongest roaming network.

Tracking bug for adding robolectric tests: b/122849296

Bug: 118705403
Test: manual
Change-Id: I72b8a8be636c442b7833e1b56f5ad2423f5c3e76
parent ac1026e6

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+6 −3
Original line number Diff line number Diff line
@@ -586,7 +586,6 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
                    Map<Integer, List<ScanResult>>> pairing : passpointConfigsAndScans) {

                WifiConfiguration config = pairing.first;



                // TODO(b/118705403): Prioritize home networks before roaming networks

                List<ScanResult> scanResults = new ArrayList<>();



                List<ScanResult> homeScans =
@@ -601,8 +600,12 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
                    roamingScans = new ArrayList<>();

                }



                // TODO(b/118705403): Differentiate home network vs roaming network for summary info

                if (!homeScans.isEmpty()) {

                    scanResults.addAll(homeScans);

                } else {

                    scanResults.addAll(roamingScans);

                }



                if (seenFQDNs.add(config.FQDN)) {

                    int bestRssi = Integer.MIN_VALUE;