From b38ac6dcc27a861151a153c1b92cec9fdf4e3242 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Thu, 3 Oct 2019 11:06:25 +0800 Subject: [PATCH] wifi: move supplicant service init to wpa_supplicant Bug: 138790309 Test: boot and wifi function is ok Change-Id: Icea6361942873b5177c5fa59f9628c3b383b4509 --- BoardConfig-common.mk | 1 + init.hardware.rc | 16 ---------------- wpa_supplicant_overlay.conf | 1 + 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index f4ffe956..9c8276fc 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -173,6 +173,7 @@ WIFI_HIDL_FEATURE_AWARE := true WIFI_HIDL_FEATURE_DUAL_INTERFACE:= true WIFI_FEATURE_WIFI_EXT_HAL := true WIFI_FEATURE_IMU_DETECTION := 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 b04f251d..7049faca 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -636,22 +636,6 @@ on property:persist.vendor.sys.ssr.enable_ramdumps=1 on property:persist.vendor.sys.ssr.enable_ramdumps=0 write /sys/module/subsystem_restart/parameters/enable_ramdumps 0 -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 - on property:init.svc.vendor.hwcomposer-2-3=stopped stop ppd diff --git a/wpa_supplicant_overlay.conf b/wpa_supplicant_overlay.conf index c263fe35..b314fc4f 100644 --- a/wpa_supplicant_overlay.conf +++ b/wpa_supplicant_overlay.conf @@ -4,3 +4,4 @@ tdls_external_control=1 wowlan_triggers=magic_pkt bss_max_count=400 interworking=1 +driver_param=use_p2p_group_interface=1