sm8250-common: rro_overlays: WifiResCommon: Update from munch

Change-Id: Iaed815ffdc7422ff3fe898d6773046da261547f9

3 files changed, 31 insertions, 21 deletions

diff --git a/rro_overlays/WifiResCommon/res/values/bools.xml b/rro_overlays/WifiResCommon/res/values/bools.xml
index e120548..107ea79 100644
--- a/rro_overlays/WifiResCommon/res/values/bools.xml
+++ b/rro_overlays/WifiResCommon/res/values/bools.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Integer indicating maximum hardware supported client number of soft ap -->
-    <bool name="config_vendorWifi11axReadySupport">true</bool>
-
-    <!-- boolean indicating whether or not to reset channel configuration during cloud configuration restore -->
-    <bool name="config_vendor_wifi_softap_owe_supported">true</bool>
-
     <!-- boolean indicating whether the WiFi chipset has 5GHz band support.
          Note: This config is replacing the config_wifi_dual_band_support
          since more bands may now be supported (such as 6GHz), the naming dual_band
          is no longer indicative, and a separate config now exists for each band -->
     <bool name="config_wifi5ghzSupport">true</bool>
 
-    <!-- boolean indicating whether the WiFi chipset has 6GHz band support -->
-    <bool translatable="false" name ="config_wifi6ghzSupport">true</bool>
+    <!-- Enable Aware NDP interface selection on interface that already has network set up.
+     Note: the default AOSP Android does not support multiple networks on the same Aware NDI.
+     Enabling this configuration will restore legacy behavior but may result in incorrect behavior.
+     -->
+    <bool name="config_wifiAllowMultipleNetworksOnSameAwareNdi">true</bool>
 
-    <!-- Wifi driver supports 6GHz band for softap -->
-    <bool translatable="false" name="config_wifiSoftap6ghzSupported">true</bool>
+    <!-- Indicates that bridged AP mode is supported on this device -->
+    <bool name="config_wifiBridgedSoftApSupported">false</bool>
 
-    <!-- Indicates that 11ax mode is supported on this device
-           Note that if this flag is set to true, then 11ax is assumed to be supported.
-           However, if it is left to the default value of false, the 11ax support will
-           be checked via NL80211 interface -->
-    <bool translatable="false" name="config_wifi11axSupportOverride">true</bool>
+    <!-- Wifi driver supports 6GHz band for softap when chip support 6GHz -->
+    <bool name="config_wifiSoftap6ghzSupported">true</bool>
 
     <!-- Wifi driver Automatic channel selection (ACS) for softap to include DFS channels -->
     <bool name="config_wifiSoftapAcsIncludeDfs">true</bool>
@@ -36,6 +30,9 @@
     <!-- Indicates that connected MAC randomization is supported on this device -->
     <bool name="config_wifi_connected_mac_randomization_supported">true</bool>
 
+    <!-- Boolean indicating that only configurations that have the same pre-shared key will be linked -->
+    <bool name="config_wifi_only_link_same_credential_configurations">false</bool>
+
     <!-- Indicates that p2p MAC randomization is supported on this device -->
     <bool name="config_wifi_p2p_mac_randomization_supported">true</bool>
 
@@ -45,15 +42,15 @@
     <!-- Wifi driver supports IEEE80211AC for softap -->
     <bool name="config_wifi_softap_ieee80211ac_supported">true</bool>
 
-    <!-- Wifi driver supports IEEE80211AX for softap -->
-    <bool name="config_wifiSoftapIeee80211axSupported">true</bool>
+    <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->
+    <bool name="config_wifi_softap_sae_supported">true</bool>
 
     <!-- Wifi driver supports IEEE80211AX single user beamformee for softap -->
     <bool name="config_wifiSoftapHeSuBeamformeeSupported">true</bool>
 
-    <!-- Wifi driver supports IEEE80211AX multiple user beamformer for softap -->
+    <!-- Wifi driver supports IEEE80211AX single user beamformer for softap -->
     <bool name="config_wifiSoftapHeSuBeamformerSupported">true</bool>
 
-    <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->
-    <bool name="config_wifi_softap_sae_supported">true</bool>
+    <!-- Wifi driver supports IEEE80211AX for softap -->
+    <bool name="config_wifiSoftapIeee80211axSupported">true</bool>
 </resources>
diff --git a/rro_overlays/WifiResCommon/res/values/integers.xml b/rro_overlays/WifiResCommon/res/values/integers.xml
index ab57c9e..dca1c24 100644
--- a/rro_overlays/WifiResCommon/res/values/integers.xml
+++ b/rro_overlays/WifiResCommon/res/values/integers.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- integer indicating additional disconnect delay (in ms) after IMS onLost() indication is received -->
+    <integer name="config_wifiDelayDisconnectOnImsLostMs">1000</integer>
+
     <!-- Integer indicating maximum hardware supported client number of soft ap -->
     <integer name="config_wifiHardwareSoftapMaxClientCount">32</integer>
 </resources>
diff --git a/rro_overlays/WifiResCommon/res/values/strings.xml b/rro_overlays/WifiResCommon/res/values/strings.xml
index b53a931..248962a 100644
--- a/rro_overlays/WifiResCommon/res/values/strings.xml
+++ b/rro_overlays/WifiResCommon/res/values/strings.xml
@@ -3,5 +3,15 @@
     <!-- List of allowed channels in 2GHz band for softap. If the device doesn't want to restrict
          channels this should be empty. Values is a comma separated channel string and/or channel
          range string like '1-6,11'. -->
-    <string name="config_wifiSoftap2gChannelList"></string>
+    <string name="config_wifiSoftap2gChannelList" />
+
+    <!-- List of allowed channels in 5GHz band for softap. If the device doesn't want to restrict
+         channels this should be empty. Values is a comma separated channel string and/or channel
+         range string like '36-48,149'. -->
+    <string name="config_wifiSoftap5gChannelList" />
+
+    <!-- List of allowed channels in 6GHz band for softap. If the device doesn't want to restrict
+         channels this should be empty. Values is a comma separated channel string and/or channel
+         range string like '36-48,149'. -->
+    <string name="config_wifiSoftap6gChannelList" />
 </resources>