Merge 3e3e5930 on remote branch

Change-Id: I401f441df025c3bb7b783ffcf981cd1f2758e305

bengal/wlan.mk

@@ -16,7 +16,8 @@ PRODUCT_COPY_FILES += \
 	device/qcom/wlan/bengal/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
 	device/qcom/wlan/bengal/icm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/icm.conf \
 	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.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
 
 # WLAN specific aosp flag
 TARGET_USES_AOSP_FOR_WLAN := false

msmnile_au/WCNSS_qcom_cfg_qca6390.ini

@@ -5,10 +5,10 @@
 gEnableConcurrentSTA=wlan1
 
 # Enable IMPS or not
-gEnableImps=0
+gEnableImps=1
 
 # Enable BMPS or not
-gEnableBmps=0
+gEnableBmps=1
 
 #Set max sub-frame msdu in one amsdu
 gMaxAmsduNum=3

sdmshrike_au/WCNSS_qcom_cfg_qca6390.ini

@@ -5,10 +5,10 @@
 gEnableConcurrentSTA=wlan1
 
 # Enable IMPS or not
-gEnableImps=0
+gEnableImps=1
 
 # Enable BMPS or not
-gEnableBmps=0
+gEnableBmps=1
 
 #Set max sub-frame msdu in one amsdu
 gMaxAmsduNum=3

sm6150_au/WCNSS_qcom_cfg_qca6390.ini

@@ -5,10 +5,10 @@
 gEnableConcurrentSTA=wlan1
 
 # Enable IMPS or not
-gEnableImps=0
+gEnableImps=1
 
 # Enable BMPS or not
-gEnableBmps=0
+gEnableBmps=1
 
 #Set max sub-frame msdu in one amsdu
 gMaxAmsduNum=3