aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy Chen <jimmycmchen@google.com>2019-10-03 11:24:23 +0800
committerDavide Garberi <dade.garberi@gmail.com>2021-10-19 15:09:38 +0200
commitf4927ff860d47a3a52fc8bd883c57fc6cde9f213 (patch)
treeedb90b1dc27385e15d8c5201a1eaef29922b60d1
parentabcdf83e230f13bd02a9efa40477d8a879f4e596 (diff)
msm8996-common: Move supplicant service init to wpa_supplicant
Bug: 138790309 Test: boot and wifi function is ok Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4
-rw-r--r--BoardConfigCommon.mk1
-rw-r--r--rootdir/etc/init.qcom.rc15
-rw-r--r--wifi/wpa_supplicant_overlay.conf1
3 files changed, 2 insertions, 15 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 6c17e09..676eaa1 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -210,4 +210,5 @@ WIFI_DRIVER_FW_PATH_AP := "ap"
WIFI_DRIVER_FW_PATH_STA := "sta"
WIFI_DRIVER_FW_PATH_P2P := "p2p"
WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION := 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 1e916e9..9339c06 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -424,21 +424,6 @@ on property:ro.data.large_tcp_window_size=true
on property:sys.sysctl.tcp_adv_win_scale=*
write /proc/sys/net/ipv4/tcp_adv_win_scale ${sys.sysctl.tcp_adv_win_scale}
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
- -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
- -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
- class main
- socket wpa_wlan0 dgram 660 wifi wifi
- disabled
- oneshot
-
service loc_launcher /vendor/bin/loc_launcher
class late_start
user gps
diff --git a/wifi/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf
index acbcff7..793caab 100644
--- a/wifi/wpa_supplicant_overlay.conf
+++ b/wifi/wpa_supplicant_overlay.conf
@@ -4,3 +4,4 @@ tdls_external_control=1
interworking=1
hs20=1
auto_interworking=0
+driver_param=use_p2p_group_interface=1