santoni: Move supplicant service init to wpa_supplicant

Bug: 138790309
Test: boot and wifi function is ok
Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4

BoardConfig.mk

@@ -260,6 +260,7 @@ WIFI_DRIVER_FW_PATH_STA := "sta"
 WIFI_DRIVER_FW_PATH_P2P := "p2p"
 WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X
+WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 
 # Inherit from the proprietary version
 -include vendor/xiaomi/santoni/BoardConfigVendor.mk

rootdir/init.qcom.rc

@@ -370,21 +370,6 @@ service vendor.sensors.qti /vendor/bin/sensors.qti
     group system
     writepid /dev/cpuset/system-background/tasks
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 -dd \
-    -g@android:vendor_wpa_wlan0
-#   we will start as root and wpa_supplicant will switch to user wifi
-#   after setting up the capabilities required for WEXT
-#   user wifi
-#   group wifi inet keystore
-    interface [email protected]::ISupplicant default
-    interface [email protected]::ISupplicant default
-    interface [email protected]::ISupplicant default
-    class main
-    socket vendor_wpa_wlan0 dgram 660 wifi wifi
-    disabled
-    oneshot
-
 service loc_launcher /vendor/bin/loc_launcher
     class late_start
     user gps

wifi/wpa_supplicant_overlay.conf

@@ -6,4 +6,5 @@ bss_max_count=400
 interworking=1
 hs20=1
 auto_interworking=0
-bss_no_flush_when_down=1
+bss_no_flush_when_down=1
+driver_param=use_p2p_group_interface=1