diff options
| author | Nathan Harold <ncharold@gmail.com> | 2017-04-14 23:45:24 -0700 |
|---|---|---|
| committer | Nathan Harold <ncharold@gmail.com> | 2017-04-15 00:35:32 -0700 |
| commit | c571e21d8510bb56d89ee4bba369999c18b4c748 (patch) | |
| tree | ff52beb88c4d29ad38f09a44398e8ffd6767de5a | |
| parent | f0223d50d12fea721a37481ed0500d6ae6d774b6 (diff) | |
| download | android_frameworks_opt_net_wifi-c571e21d8510bb56d89ee4bba369999c18b4c748.tar.gz android_frameworks_opt_net_wifi-c571e21d8510bb56d89ee4bba369999c18b4c748.tar.bz2 android_frameworks_opt_net_wifi-c571e21d8510bb56d89ee4bba369999c18b4c748.zip | |
Load the correct Wifi Saturation Threshold by Band
The saturation threshold for Wifi is band specific;
thus, we should load the band-specific value.
Change-Id: I527480f8c29a406323722ef13de942c85667dac1
| -rw-r--r-- | service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java index e429d835a..6f4f7bc67 100644 --- a/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java @@ -436,11 +436,15 @@ public class WifiQualifiedNetworkSelector { WifiConfiguration currentNetwork, boolean sameBssid, boolean sameSelect, StringBuffer sbuf) { - int score = 0; - //calculate the RSSI score - int rssi = scanResult.level <= mWifiConfigManager.mThresholdSaturatedRssi24.get() - ? scanResult.level : mWifiConfigManager.mThresholdSaturatedRssi24.get(); - score += (rssi + mRssiScoreOffset) * mRssiScoreSlope; + // get the band-specific saturation threshold + int saturationThreshold = scanResult.is24GHz() ? + mWifiConfigManager.mThresholdSaturatedRssi24.get() : + mWifiConfigManager.mThresholdSaturatedRssi5.get(); + + // calculate the RSSI score, capped by the saturation threshold + int rssi = Math.min(scanResult.level, saturationThreshold); + + int score = (rssi + mRssiScoreOffset) * mRssiScoreSlope; sbuf.append(" RSSI score: " + score); if (scanResult.is5GHz()) { //5GHz band |