From 9f2a72251da366ae98a90095151874565f6f3702 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Thu, 3 Oct 2019 11:24:23 +0800 Subject: [PATCH] wifi: move supplicant service init to wpa_supplicant Bug: 138790309 Test: boot and wifi function is ok Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4 --- BoardConfig.mk | 1 + init.hardware.rc | 16 ---------------- wpa_supplicant_overlay.conf | 1 + 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 49462c60..ba4e565c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -128,6 +128,7 @@ WIFI_DRIVER_FW_PATH_P2P := "p2p" BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) WIFI_HIDL_FEATURE_AWARE := true +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true # Audio BOARD_USES_ALSA_AUDIO := true diff --git a/init.hardware.rc b/init.hardware.rc index 19e3d75d..193c6815 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -601,22 +601,6 @@ service vendor.tftp_server /vendor/bin/tftp_server user root group root system -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 -dd \ - -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 - interface android.hardware.wifi.supplicant@1.3::ISupplicant default - class main - socket wpa_wlan0 dgram 660 wifi wifi - disabled - oneshot - service vendor.cnss-daemon /vendor/bin/cnss-daemon -n -l class late_start user system diff --git a/wpa_supplicant_overlay.conf b/wpa_supplicant_overlay.conf index 16c28040..5c99eeea 100644 --- a/wpa_supplicant_overlay.conf +++ b/wpa_supplicant_overlay.conf @@ -6,3 +6,4 @@ interworking=1 hs20=1 auto_interworking=0 bss_no_flush_when_down=1 +driver_param=use_p2p_group_interface=1