Don't start supplicant with interfaces
authorRoshan Pius <rpius@google.com>
Thu, 18 Jan 2018 22:24:13 +0000 (14:24 -0800)
committerJan Altensen <info@stricted.net>
Mon, 25 Feb 2019 11:52:35 +0000 (12:52 +0100)
Framework will now add interface to supplicant (via HIDL) when it
needs to control an interface, so don't specify them in the startup
params.

Bug: 69426063
Test: Device boots up and able to connect to wifi.
Change-Id: I817d28093f8b982e3806c212babd888c0f5eb7c0

ramdisk/init.mt8127.rc

index 483668abfab8cdf9cddf2da1a641cd46ad661890..9bb5e568b00b92e8b09c7a4df680623511191782 100644 (file)
@@ -446,10 +446,7 @@ on property:wlan.driver.status=unloaded
 #remove -puse_p2p_group_interface=1, our driver doesnot support this feature
 #
 service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
-    -I/system/etc/wifi/wpa_supplicant_overlay.conf -N \
-    -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf -dd \
-    -I/system/etc/wifi/p2p_supplicant_overlay.conf \
+    -puse_p2p_group_interface=1p2p_device=1 \
     -O/data/vendor/wifi/wpa/sockets \
     -g@android:wpa_wlan0
     #   we will start as root and wpa_supplicant will switch to user wifi
@@ -458,7 +455,7 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     #   group wifi inet keystore
     interface android.hardware.wifi.supplicant@1.0::ISupplicant default
     interface android.hardware.wifi.supplicant@1.1::ISupplicant default
-    class late_start
+    class main
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot