Merge "p2p: fix p2p configuration" into tm-qpr-dev am: 38385b5721

Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/19537153

Change-Id: Iaf1b2bbff24243d7b8cb25df70d358d89e373953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

conf/init.tangorpro.rc

@@ -84,16 +84,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

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