From 3483016d07bffb05dec7b1534e1316505e89b993 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Mon, 8 Aug 2022 11:03:28 +0800 Subject: [PATCH] p2p: fix p2p configuration The correct path should be under /data, or it is not writable. wpa_supplicant now support p2p overlay configuration, a unified wpa_supplicant init entry can be used. Bug: 238601241 Test: create a group and check this group is persisted after reboot Change-Id: If22efca993dfb55616df0166f3aab860bbcd3073 --- conf/init.tangorpro.rc | 10 ---------- wifi/BoardConfig-wifi.mk | 3 ++- ...p2p_supplicant.conf => p2p_supplicant_overlay.conf} | 0 3 files changed, 2 insertions(+), 11 deletions(-) rename wifi/{p2p_supplicant.conf => p2p_supplicant_overlay.conf} (100%) diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index d599bd2..a33aa7f 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -87,16 +87,6 @@ on post-fs-data setprop wifi.direct.interface p2p-dev-wlan0 setprop wifi.aware.interface aware_nmi0 -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ - -m/vendor/etc/wifi/p2p_supplicant.conf \ - -g@android:wpa_wlan0 -dd - interface aidl android.hardware.wifi.supplicant.ISupplicant/default - socket wpa_wlan0 dgram 660 wifi wifi - class main - disabled - oneshot - # Audio on post-fs-data chmod 644 /mnt/vendor/persist/audio/speaker.cal diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 2e02ca1..0aaffe5 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -27,7 +27,8 @@ WIFI_FEATURE_IMU_DETECTION := true # Avoid Wifi reset on MAC Address change WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true PRODUCT_COPY_FILES += \ - device/google/tangorpro/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \ + device/google/tangorpro/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ device/google/tangorpro/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant_overlay.conf similarity index 100% rename from wifi/p2p_supplicant.conf rename to wifi/p2p_supplicant_overlay.conf