Merge 741f9d4b on remote branch

Change-Id: I4091e768711bde5cb316e45474b2a6b8f1eb2f26

kona/WCNSS_qcom_cfg.ini

@@ -304,6 +304,12 @@ gIPAHighBandwidthMbps=800
 # 0 - disable, 1 - enable(default)
 wlm_latency_enable=1
 
+# This ini is used to give higher priority for 5g scc than dbs.
+# It is bitmap per enum policy_mgr_con_mode.
+# For example in GO+STA(5G) mode, when TPUT is onfigured as wlan system
+# preference option, If 5G SCC needs higher priority than dbs, set it as 8.
+g_prefer_5g_scc_to_dbs=8
+
 END
 
 # Note: Configuration parser would not read anything past the END marker

sm6150_au/wlan.mk

@@ -6,13 +6,11 @@ PRODUCT_PACKAGES += \
 	wificond \
 	wifilogd
 
-#PRODUCT_COPY_FILES += \
-#	device/qcom/wlan/sm6150_au/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
-#	device/qcom/wlan/sm6150_au/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
+PRODUCT_COPY_FILES += \
+	frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml \
+	frameworks/native/data/etc/android.hardware.wifi.rtt.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.rtt.xml \
+	frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml
 
-# Enable STA+SAP+P2P
-#WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
-#QC_WIFI_HIDL_FEATURE_STA_SAP_P2P := true
 
 ######## For multiple ko support ########
 
@@ -43,6 +41,7 @@ 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
+WIFI_HIDL_FEATURE_AWARE := true
 else
 # Value-added AOSP: STA + SAP + P2P or NAN
 WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{AP}, 1}, {{P2P, NAN}, 1}}