From 3d015b03ab5ff0d80fa7d16e3d0be60f4173c942 Mon Sep 17 00:00:00 2001 From: Sunil Ravi Date: Thu, 6 May 2021 18:10:30 +0000 Subject: [PATCH] Revert "Wifi: Move supplicant service init to wpa_supplicant" This reverts commit 788012640b32e89d112a4e78607fd5eabbb7c1c4 Reason for revert: Caused throughput issue in p2p b/187302501 Bug: 187302501 Bug: 186636898 Test: boot and wifi function is ok Test: p2p connection and throughput tests. Change-Id: I70f4015040f10452acff697ee504b02cfb3c1e27 --- BoardConfig-common.mk | 1 - conf/init.gs101.rc | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index ef735b56..b1050bd4 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -341,7 +341,6 @@ WIFI_FEATURE_IMU_DETECTION := true # Avoid Wifi reset on MAC Address change WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true -WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true # NeuralNetworks GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index c401fcee..b7897ff2 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -501,6 +501,19 @@ service abox /vendor/bin/main_abox 17c50000.abox group audioserver seclabel u:r:abox:s0 +service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ + -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \ + -m/vendor/etc/wifi/p2p_supplicant.conf \ + -g@android:wpa_wlan0 -dd + 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 + class main + disabled + oneshot + + # GPS service lhd /vendor/bin/hw/lhd /vendor/etc/gnss/lhd.conf class main