Increase security bonus score to 40 and reduce rssi cap
1) Increase security bonus score from 10 to 40 to be more in favor of
secure network.
2) Reduce rssi cap from good_rssi_threshold to low_rssi_threshold (also
known as sufficient_rssi_threshold) so that the network with clean
channel and higher BW is more likely to be selected at middle
range/rssi.
Bug: 157081384
Test: atest com.android.server.wifi
Test: manual test with adb shell dumpsys wifi and check
wifiNetworkSelector logs
Change-Id: I791ed9c683358003bb8e264ebf5c72c2fb710a6c
diff --git a/service/java/com/android/server/wifi/ScoringParams.java b/service/java/com/android/server/wifi/ScoringParams.java
index 460cb9c..f2a3182 100644
--- a/service/java/com/android/server/wifi/ScoringParams.java
+++ b/service/java/com/android/server/wifi/ScoringParams.java
@@ -91,7 +91,7 @@
public int unmeteredNetworkBonus = 1000;
public int currentNetworkBonusMin = 20;
public int currentNetworkBonusPercent = 20;
- public int secureNetworkBonus = 10;
+ public int secureNetworkBonus = 40;
public int lastSelectionMinutes = 480;
public static final int MIN_MINUTES = 1;
public static final int MAX_MINUTES = Integer.MAX_VALUE / (60 * 1000);
diff --git a/service/java/com/android/server/wifi/ThroughputScorer.java b/service/java/com/android/server/wifi/ThroughputScorer.java
index 0371568..ed0d0da 100644
--- a/service/java/com/android/server/wifi/ThroughputScorer.java
+++ b/service/java/com/android/server/wifi/ThroughputScorer.java
@@ -70,7 +70,7 @@
* Calculates an individual candidate's score.
*/
private ScoredCandidate scoreCandidate(Candidate candidate) {
- int rssiSaturationThreshold = mScoringParams.getGoodRssi(candidate.getFrequency());
+ int rssiSaturationThreshold = mScoringParams.getSufficientRssi(candidate.getFrequency());
int rssi = Math.min(candidate.getScanRssi(), rssiSaturationThreshold);
int rssiBaseScore = (rssi + RSSI_SCORE_OFFSET) * RSSI_SCORE_SLOPE_IS_4;
diff --git a/service/res/values/config.xml b/service/res/values/config.xml
index 5d8a47c..9c8c73c 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -101,7 +101,7 @@
<!-- Integer specifying the percent bonus for current network. The percent is applied to
the sum of rssi base score and throughput score-->
<integer translatable="false" name="config_wifiFrameworkCurrentNetworkBonusPercent">20</integer>
- <integer translatable="false" name="config_wifiFrameworkSecureNetworkBonus">10</integer>
+ <integer translatable="false" name="config_wifiFrameworkSecureNetworkBonus">40</integer>
<!-- The duration in minutes to strongly favor the last-selected network over other options. -->
<integer translatable="false" name="config_wifiFrameworkLastSelectionMinutes">480</integer>