sdm660-common: wifi: move supplicant service init to wpa_supplicant

Bug: 138790309
Test: boot and wifi function is ok
Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4
This commit is contained in:
Jimmy Chen 2019-10-03 11:24:23 +08:00 committed by OdSazib
parent 86cc5f4fc7
commit a38fe7fd69
No known key found for this signature in database
GPG key ID: 0954440B60470871
3 changed files with 2 additions and 16 deletions

View file

@ -270,6 +270,7 @@ WIFI_DRIVER_FW_PATH_P2P := "p2p"
WIFI_DRIVER_OPERSTATE_PATH := "/sys/class/net/wlan0/operstate" WIFI_DRIVER_OPERSTATE_PATH := "/sys/class/net/wlan0/operstate"
WIFI_HIDL_FEATURE_DUAL_INTERFACE := true WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
WIFI_HIDL_FEATURE_AWARE := true WIFI_HIDL_FEATURE_AWARE := true
WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
WPA_SUPPLICANT_VERSION := VER_0_8_X WPA_SUPPLICANT_VERSION := VER_0_8_X
# Inherit the proprietary files # Inherit the proprietary files

View file

@ -7,3 +7,4 @@ bss_max_count=512
auto_interworking=0 auto_interworking=0
bss_no_flush_when_down=1 bss_no_flush_when_down=1
wowlan_triggers=magic_pkt wowlan_triggers=magic_pkt
driver_param=use_p2p_group_interface=1

View file

@ -636,22 +636,6 @@ 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 \
-O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \
-g@android:vendor_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 vendor_wpa_wlan0 dgram 660 wifi wifi
disabled
oneshot
writepid /dev/cpuset/system-background/tasks
# 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