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 09c7a1c144.

Change-Id: Ib4b9b99d709f9a169fd1f3f081545c9220271605

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
+

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

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
+

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