From 8341c18facc5ce625686459741d437fbd86dfd8a Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Thu, 3 Oct 2019 11:24:23 +0800 Subject: [PATCH] davinci: Move supplicant service init to wpa_supplicant Bug: 138790309 Test: boot and wifi function is ok Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4 --- BoardConfig.mk | 1 + rootdir/etc/init.qcom.rc | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 7e33112..8f7227c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -207,4 +207,5 @@ WIFI_DRIVER_STATE_OFF := "OFF" WIFI_DRIVER_STATE_ON := "ON" WIFI_HIDL_FEATURE_AWARE := true WIFI_HIDL_FEATURE_DUAL_INTERFACE := true +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index ed0caff..c1def37 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -270,21 +270,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 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 vendor_wpa_wlan0 dgram 660 wifi wifi - disabled - oneshot - service vendor.cnss-daemon /vendor/bin/cnss-daemon -n -l class late_start user system