From b4d44ad7d7062f34423472620d0d90e52d50632b Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Thu, 3 Oct 2019 11:24:23 +0800 Subject: [PATCH] universal7885: Move supplicant service init to wpa_supplicant Bug: 138790309 Test: boot and wifi function is ok Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4 Signed-off-by: SamarV-121 --- BoardConfigCommon.mk | 1 + configs/wpa_supplicant_overlay.conf | 3 ++- rootdir/etc/wifi.rc | 11 ----------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index bc575ea..5556cc7 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -87,3 +87,4 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true diff --git a/configs/wpa_supplicant_overlay.conf b/configs/wpa_supplicant_overlay.conf index 8479b25..ff3e49e 100644 --- a/configs/wpa_supplicant_overlay.conf +++ b/configs/wpa_supplicant_overlay.conf @@ -1,2 +1,3 @@ p2p_disabled=1 -update_config=1 \ No newline at end of file +update_config=1 +driver_param=use_p2p_group_interface=1 diff --git a/rootdir/etc/wifi.rc b/rootdir/etc/wifi.rc index d4795ca..878eeab 100644 --- a/rootdir/etc/wifi.rc +++ b/rootdir/etc/wifi.rc @@ -37,17 +37,6 @@ on post-fs-data on boot setprop wifi.interface wlan0 -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \ - -g@android:wpa_wlan0 - class main - 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 - socket wpa_wlan0 dgram 660 wifi wifi - disabled - oneshot - # start for WiFi MFG (TestMode) service macloader /system/vendor/bin/hw/macloader class main