commit c6d1042d9b73f56315a3aa5619d2819aeade2776
author Alexander Koskovich <akoskovich@pm.me> Tue Jun 21 15:27:46 2022 -0700
committer micky387 <mickaelsaibi@free.fr> Sat Mar 30 12:19:52 2024 -0400
tree b66d031f8e0aebfb47473289800218c0d5a48067
parent 2595b815d68a5a8f06729be2080ebb20c58a825a

zenfone9: Disable WiFi Aware & RTT for unsupported target

 * Lahaina is supposed to be a supported target, but
   some CTS tests fail.

Change-Id: I5921e0f4ecb2140a5610059bdd16cc6e99d7d725

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5d9a205..4d29ca6 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -255,7 +255,6 @@
 WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan"
 WIFI_DRIVER_STATE_OFF := "OFF"
 WIFI_DRIVER_STATE_ON := "ON"
-WIFI_HIDL_FEATURE_AWARE := true
 WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X

proprietary-files-vendor.txt

diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index a0cbaf4..92bc4dd 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -651,10 +651,8 @@
 vendor/etc/permissions/android.hardware.vulkan.compute-0.xml
 vendor/etc/permissions/android.hardware.vulkan.level-1.xml
 vendor/etc/permissions/android.hardware.vulkan.version-1_1.xml
-vendor/etc/permissions/android.hardware.wifi.aware.xml
 vendor/etc/permissions/android.hardware.wifi.direct.xml
 vendor/etc/permissions/android.hardware.wifi.passpoint.xml
-vendor/etc/permissions/android.hardware.wifi.rtt.xml
 vendor/etc/permissions/android.hardware.wifi.xml
 vendor/etc/permissions/android.software.device_id_attestation.xml
 vendor/etc/permissions/android.software.ipsec_tunnels.xml

regen-vendor.sh

diff --git a/regen-vendor.sh b/regen-vendor.sh
index 301fdb8..d4a87f5 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -1105,6 +1105,8 @@
     # Wifi
     "bin/hw/android.hardware.wifi@1.0-service"
     "etc/init/android.hardware.wifi@1.0-service.rc"
+    "etc/permissions/android.hardware.wifi.aware.xml"
+    "etc/permissions/android.hardware.wifi.rtt.xml"
     "etc/vintf/manifest/android.hardware.wifi@1.0-service.xml"
     "bin/wifistresstest.sh"
     "etc/init/vendor.qti.hardware.wifi.wifilearner@1.0-service.rc"

vendor.prop

diff --git a/vendor.prop b/vendor.prop
index d3b761b..e4cff06 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -41,7 +41,6 @@
 ro.vendor.beluga.c=0x4800
 ro.vendor.beluga.s=0x900
 ro.vendor.beluga.t=0x240
-wifi.aware.interface=wifi-aware0
 ro.incremental.enable=yes
 persist.vendor.qfp=true
 ro.vendor.qspm.enable=true