Add min rssi and band boost for 6GHz band
This commit adds the overlay configs and their usage in PNO
scanning for the following:
1. minRssi
2. 6GHZ band boost
Bug: 139354972
Test: atest com.android.server.wifi
Change-Id: I28a9c2d7813005503d5c805e024091e155d46415
diff --git a/service/res/values/config.xml b/service/res/values/config.xml
index e35fcf0..b7f6a70 100644
--- a/service/res/values/config.xml
+++ b/service/res/values/config.xml
@@ -68,6 +68,7 @@
<!-- Integer specifying the basic autojoin parameters -->
<integer translatable="false" name="config_wifi_framework_5GHz_preference_boost_factor">40</integer>
+ <integer translatable="false" name="config_wifiFramework6ghzPreferenceBoostFactor">40</integer>
<integer translatable="false" name="config_wifi_framework_RSSI_SCORE_OFFSET">85</integer>
<integer translatable="false" name="config_wifi_framework_RSSI_SCORE_SLOPE">4</integer>
<integer translatable="false" name="config_wifi_framework_SAME_BSSID_AWARD">24</integer>
@@ -91,6 +92,10 @@
<integer translatable="false" name="config_wifi_framework_wifi_score_entry_rssi_threshold_24GHz">-80</integer>
<integer translatable="false" name="config_wifi_framework_wifi_score_low_rssi_threshold_24GHz">-73</integer>
<integer translatable="false" name="config_wifi_framework_wifi_score_good_rssi_threshold_24GHz">-60</integer>
+ <integer translatable="false" name="config_wifiFrameworkScoreBadRssiThreshold6ghz">-80</integer>
+ <integer translatable="false" name="config_wifiFrameworkScoreEntryRssiThreshold6ghz">-77</integer>
+ <integer translatable="false" name="config_wifiFrameworkScoreLowRssiThreshold6ghz">-70</integer>
+ <integer translatable="false" name="config_wifiFrameworkScoreGoodRssiThreshold6ghz">-57</integer>
<!-- Integer delay in milliseconds before shutting down soft AP when there
are no connected devices. Framework will enforce a minimum limit on
diff --git a/service/res/values/overlayable.xml b/service/res/values/overlayable.xml
index 8e418e6..6068474 100644
--- a/service/res/values/overlayable.xml
+++ b/service/res/values/overlayable.xml
@@ -32,6 +32,7 @@
<item type="array" name="config_wifi_fatal_firmware_alert_error_code_list" />
<item type="bool" name="config_wifi_turn_off_during_emergency_call" />
<item type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" />
+ <item type="integer" name="config_wifiFramework6ghzPreferenceBoostFactor" />
<item type="integer" name="config_wifi_framework_RSSI_SCORE_OFFSET" />
<item type="integer" name="config_wifi_framework_RSSI_SCORE_SLOPE" />
<item type="integer" name="config_wifi_framework_SAME_BSSID_AWARD" />
@@ -49,6 +50,10 @@
<item type="integer" name="config_wifi_framework_wifi_score_entry_rssi_threshold_24GHz" />
<item type="integer" name="config_wifi_framework_wifi_score_low_rssi_threshold_24GHz" />
<item type="integer" name="config_wifi_framework_wifi_score_good_rssi_threshold_24GHz" />
+ <item type="integer" name="config_wifiFrameworkScoreBadRssiThreshold6ghz" />
+ <item type="integer" name="config_wifiFrameworkScoreEntryRssiThreshold6ghz" />
+ <item type="integer" name="config_wifiFrameworkScoreLowRssiThreshold6ghz" />
+ <item type="integer" name="config_wifiFrameworkScoreGoodRssiThreshold6ghz" />
<item type="integer" name="config_wifi_framework_soft_ap_timeout_delay" />
<item type="string" name="config_wifi_random_mac_oui" />
<item type="string" name="config_wifi_framework_sap_2G_channel_list" />