diff options
Diffstat (limited to 'service/java/com/android/server/wifi/WifiNetworkSelector.java')
-rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkSelector.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java index 5e9e4ef01..fe2470535 100644 --- a/service/java/com/android/server/wifi/WifiNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java @@ -258,6 +258,14 @@ public class WifiNetworkSelector { return (network.SSID + ":" + network.networkId); } + /** + * Compares ScanResult level against the minimum threshold for its band, returns true if lower + */ + public boolean isSignalTooWeak(ScanResult scanResult) { + return ((scanResult.is24GHz() && scanResult.level < mThresholdMinimumRssi24) + || (scanResult.is5GHz() && scanResult.level < mThresholdMinimumRssi5)); + } + private List<ScanDetail> filterScanResults(List<ScanDetail> scanDetails, HashSet<String> bssidBlacklist, boolean isConnected, String currentBssid) { ArrayList<NetworkKey> unscoredNetworks = new ArrayList<NetworkKey>(); @@ -288,10 +296,7 @@ public class WifiNetworkSelector { } // Skip network with too weak signals. - if ((scanResult.is24GHz() && scanResult.level - < mThresholdMinimumRssi24) - || (scanResult.is5GHz() && scanResult.level - < mThresholdMinimumRssi5)) { + if (isSignalTooWeak(scanResult)) { lowRssi.append(scanId).append("(") .append(scanResult.is24GHz() ? "2.4GHz" : "5GHz") .append(")").append(scanResult.level).append(" / "); |