From f3956b3552605c74a35fd25f979fc32dbdab9a40 Mon Sep 17 00:00:00 2001
From: Hu Wang <huw@codeaurora.org>
Date: Wed, 1 Jan 2020 15:56:53 +0800
Subject: [PATCH] sm6150_au: Enable android aware/rtt/passpoint feature
CRs-Fixed: 2595448
Change-Id: Ic89224eb8fe7f268e0c7ce31fe1cd2139bef4b39
---
sm6150_au/wlan.mk | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sm6150_au/wlan.mk b/sm6150_au/wlan.mk
index 07478e7..aacb43f 100644
--- a/sm6150_au/wlan.mk
+++ b/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}}
--
GitLab