Don't define superfluous wpa_supplicant service
Bug: 30816535
Change-Id: I11572d02e14ac740019f5d8c1fa2b4e02172bd39
diff --git a/init.common.rc b/init.common.rc
index fca2c2d..5230259 100755
--- a/init.common.rc
+++ b/init.common.rc
@@ -586,7 +586,7 @@
user radio
group radio diag usb
-service p2p_supplicant /system/bin/wpa_supplicant \
+service wpa_supplicant /system/bin/wpa_supplicant \
-ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
-I/system/etc/wifi/p2p_supplicant_overlay.conf -N \
-iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
@@ -602,20 +602,6 @@
disabled
oneshot
-service wpa_supplicant /system/bin/wpa_supplicant \
- -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
- -I/system/etc/wifi/wpa_supplicant_overlay.conf \
- -O/data/misc/wifi/sockets -dd \
- -e/data/misc/wifi/entropy.bin -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
- class main
- socket wpa_wlan0 dgram 660 wifi wifi
- disabled
- oneshot
-
service cnss_diag /system/bin/cnss_diag -q
class late_start
user root
