universal7580: Move supplicant service init to wpa_supplicant

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

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a6bea5505133f62226d504199475041dacb77108..2d6d118c22ce8e1a111977ef53e32b30783d8e35 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -158,6 +158,7 @@ WIFI_DRIVER_FW_PATH_PARAM        := "/sys/module/dhd/parameters/firmware_path"
 WIFI_DRIVER_FW_PATH_STA          := "/vendor/etc/wifi/bcmdhd_sta.bin"
 WIFI_DRIVER_FW_PATH_AP           := "/vendor/etc/wifi/bcmdhd_apsta.bin"
 WIFI_BAND                        := 802_11_ABG
+WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 
 # MACLOADER
 BOARD_HAVE_SAMSUNG_WIFI          := true

diff --git a/ramdisk/etc/init.wifi.rc b/ramdisk/etc/init.wifi.rc
index 5f9e366b1efa1b28fb9c29d279d9bb39ff46c0a0..d6d9f828c9cd467e03edb50d93c3a3dda0289fd7 100644 (file)
--- a/ramdisk/etc/init.wifi.rc
+++ b/ramdisk/etc/init.wifi.rc
@@ -47,22 +47,6 @@ service wifiloader /vendor/bin/wifiloader
     class main
     oneshot
 
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -puse_p2p_group_interface=1 \
-    -O/data/vendor/wifi/wpa/sockets \
-    -g@android: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 android.hardware.wifi.supplicant@1.0::ISupplicant default
-    interface android.hardware.wifi.supplicant@1.1::ISupplicant default
-    interface android.hardware.wifi.supplicant@1.2::ISupplicant default
-    class main
-    socket wpa_wlan0 dgram 660 wifi wifi
-    disabled
-    oneshot
-
 # end of WiFi MFG (TestMode)
 
 #service olsrd /system/bin/olsrd -f /etc/wifi/olsrd.conf