From 35505777666ef29aee2bacd370c17f0bbe76d5b7 Mon Sep 17 00:00:00 2001 From: ahujapalash Date: Tue, 23 Aug 2022 13:27:49 -0700 Subject: [PATCH] Revert "p2p: fix p2p configuration" DroidMonitor-triggered revert due to breakage - https://android-build.googleplex.com/builds/quarterdeck?branch=git_tm-qpr-dev&target=aosp_felix-userdebug&lkgb=8982522&lkbb=8982848&fkbb=8982848 BUG: b/243544635 This reverts commit 09c7a1c14475fe4e14eaf6a189654ea9f32638a5. Change-Id: Ib4b9b99d709f9a169fd1f3f081545c9220271605 --- conf/init.cloudripper.rc | 10 ++++++++++ conf/init.pantah.rc | 10 ++++++++++ conf/init.ravenclaw.rc | 10 ++++++++++ wifi/BoardConfig-wifi.mk | 3 +-- ...p2p_supplicant_overlay.conf => p2p_supplicant.conf} | 0 5 files changed, 31 insertions(+), 2 deletions(-) rename wifi/{p2p_supplicant_overlay.conf => p2p_supplicant.conf} (100%) diff --git a/conf/init.cloudripper.rc b/conf/init.cloudripper.rc index 8fe9268..76a8309 100644 --- a/conf/init.cloudripper.rc +++ b/conf/init.cloudripper.rc @@ -51,3 +51,13 @@ 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 + diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index e14b913..1abbf21 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -63,6 +63,16 @@ on post-fs-data chown system system /mnt/vendor/persist/sensors/registry/vd6282_spectral_fac_cal.reg chmod 600 /mnt/vendor/persist/sensors/registry/vd6282_spectral_fac_cal.reg +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 + # NFC on property:ro.boot.hardware.revision=PROTO1.0 setprop persist.vendor.nfc.config_file_name libnfc-hal-st-proto1.conf diff --git a/conf/init.ravenclaw.rc b/conf/init.ravenclaw.rc index 70bae17..d2ce3d8 100644 --- a/conf/init.ravenclaw.rc +++ b/conf/init.ravenclaw.rc @@ -43,3 +43,13 @@ 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 + diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index bc0cb80..64a6fb5 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -30,9 +30,8 @@ WIFI_FEATURE_IMU_DETECTION := true WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true -WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true PRODUCT_COPY_FILES += \ - device/google/pantah/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ + device/google/pantah/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \ device/google/pantah/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant.conf similarity index 100% rename from wifi/p2p_supplicant_overlay.conf rename to wifi/p2p_supplicant.conf