gts3l-common: wlan: Move supplicant service init to wpa_supplicant

Got hints from
c4159c26a2

Signed-off-by: Deokgyu Yang <secugyu@gmail.com>
Change-Id: I03de16ccedbd80a015a7c7d80719c4bb10559232
This commit is contained in:
Deokgyu Yang 2021-11-20 01:41:52 +09:00
parent 0585eb2e34
commit f364604f31
2 changed files with 31 additions and 30 deletions

View file

@ -196,4 +196,5 @@ WIFI_DRIVER_FW_PATH_AP := "ap"
WIFI_DRIVER_FW_PATH_STA := "sta" WIFI_DRIVER_FW_PATH_STA := "sta"
WIFI_DRIVER_FW_PATH_P2P := "p2p" WIFI_DRIVER_FW_PATH_P2P := "p2p"
WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION := true WIFI_HIDL_FEATURE_DISABLE_AP_MAC_RANDOMIZATION := true
WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
WPA_SUPPLICANT_VERSION := VER_0_8_X WPA_SUPPLICANT_VERSION := VER_0_8_X

View file

@ -579,36 +579,36 @@ on property:ro.data.large_tcp_window_size=true
on property:sys.sysctl.tcp_adv_win_scale=* on property:sys.sysctl.tcp_adv_win_scale=*
write /proc/sys/net/ipv4/tcp_adv_win_scale ${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 \ #service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 -dd \ # -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 -dd \
-g@android:vendor_wpa_wlan0 # -g@android:vendor_wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi ## we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT ## after setting up the capabilities required for WEXT
# user wifi ## user wifi
# group wifi inet keystore ## group wifi inet keystore
interface android.hardware.wifi.supplicant@1.0::ISupplicant default # interface android.hardware.wifi.supplicant@1.0::ISupplicant default
interface android.hardware.wifi.supplicant@1.1::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.2::ISupplicant default
class main # class main
socket vendor_wpa_wlan0 dgram 660 wifi wifi # socket vendor_wpa_wlan0 dgram 660 wifi wifi
disabled # disabled
oneshot # oneshot
#
service vendor.wigig_supplicant /vendor/bin/hw/wpa_supplicant \ #service vendor.wigig_supplicant /vendor/bin/hw/wpa_supplicant \
-iwigig0 -Dnl80211 -c/data/vendor/wifi/wigig_supplicant.conf \ # -iwigig0 -Dnl80211 -c/data/vendor/wifi/wigig_supplicant.conf \
-m/data/vendor/wifi/wigig_p2p_supplicant.conf \ # -m/data/vendor/wifi/wigig_p2p_supplicant.conf \
-O/data/vendor/wifi/wigig_sockets -dd \ # -O/data/vendor/wifi/wigig_sockets -dd \
-e/data/vendor/wifi/wigig_entropy.bin -g@android:wpa_wigig0 \ # -e/data/vendor/wifi/wigig_entropy.bin -g@android:wpa_wigig0 \
-S wigigsvc # -S wigigsvc
# we will start as root and wpa_supplicant will switch to user wifi # # we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT # # after setting up the capabilities required for WEXT
# user wifi # # user wifi
# group wifi inet keystore # # group wifi inet keystore
class main # class main
socket wpa_wigig0 dgram 660 wifi wifi # socket wpa_wigig0 dgram 660 wifi wifi
disabled # disabled
oneshot # oneshot
#
# Data Migration # Data Migration
service vendor.move_wifi_data /system/bin/move_wifi_data.sh service vendor.move_wifi_data /system/bin/move_wifi_data.sh
class main class main