Merge "sdmshrike_au: Enable STA+SAP support" into wlan-service.lnx.5.0

sdmshrike_au/WCNSS_qcom_cfg.ini

 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
+# Enable cocurrent interface wlan1
+gEnableConcurrentSTA=wlan1
+
 # Enable IMPS or not
 gEnableImps=1
 

sdmshrike_au/WCNSS_qcom_cfg_qca6174.ini

 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
+# Enable cocurrent interface wlan1
+gEnableConcurrentSTA=wlan1
+
 # Enable IMPS or not
 gEnableImps=1
 

sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini

 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
+# Enable cocurrent interface wlan1
+gEnableConcurrentSTA=wlan1
+
 # Enable IMPS or not
 gEnableImps=0
 

sdmshrike_au/WCNSS_qcom_cfg_qcn7605.ini

 # This file allows user to override the factory
 # defaults for the WLAN Driver
 
+# Enable cocurrent interface wlan1
+gEnableConcurrentSTA=wlan1
+
 # Enable IMPS or not
 gEnableImps=0
 #gEnableImps=0

sdmshrike_au/wlan.mk

@@ -37,3 +37,11 @@ PRODUCT_PACKAGES += init.qcom.wlan.sh
 PRODUCT_COPY_FILES += \
     device/qcom/wlan/msmnile_au/init.qcom.wlan.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.wlan.sh
 endif
+
+ifeq ($(TARGET_USES_AOSP_FOR_WLAN), true)
+# Pure AOSP: Use pre-defined interface combinations with STA+SAP support
+WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
+else
+# Value-added AOSP: STA + SAP + P2P or NAN
+WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}
+endif