From ae0e8ef2fb8538f15508a7f0d412c2683a9ef9e4 Mon Sep 17 00:00:00 2001 From: normanwhl Date: Tue, 14 Jun 2022 04:39:29 +0000 Subject: [PATCH] Integrate wifi configuraions for tangorpro 1. Add supplicant service init 2. Add p2p and aware interface property 3. Force softap use wlan1 interface 4. verbose logging always on for userdebug build Bug: 235906179 Test: 1. check supplicant can be started 2. check property ro.vendor.wifi.sap.interface 3. check property wifi.direct.interface 4. check property wifi.aware.interface Change-Id: I92d83db81e5260b8bb781e9263c0bef62fbf8d7a --- conf/init.tangorpro.rc | 15 +++++++++++++-- device-tangorpro.mk | 4 ++++ rro_overlays/WifiOverlay/res/values/config.xml | 6 ++++++ wifi/BoardConfig-wifi.mk | 3 +++ wifi/p2p_supplicant.conf | 10 ++++++++++ wifi/wpa_supplicant_overlay.conf | 10 ++++++++++ 6 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 wifi/p2p_supplicant.conf create mode 100644 wifi/wpa_supplicant_overlay.conf diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index 6534386..bdd0d95 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -62,5 +62,16 @@ on post-fs-data exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app # Wifi -on property:sys.boot_completed=1 - write /sys/bus/platform/drivers/cnss2/qcom,cnss-qca6490/fs_ready 1 +on post-fs-data + setprop wifi.direct.interface p2p-dev-wlan0 + setprop wifi.aware.interface aware_nmi0 + +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 aidl android.hardware.wifi.supplicant.ISupplicant/default + socket wpa_wlan0 dgram 660 wifi wifi + class main + disabled + oneshot diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 8fdd68f..9e93903 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -155,5 +155,9 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 +# Wifi SAP Interface Name +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.wifi.sap.interface=wlan1 + # Set ro.crypto.metadata_init_delete_all_keys.enabled to false to unblock boot PRODUCT_PROPERTY_OVERRIDES += ro.crypto.metadata_init_delete_all_keys.enabled=false diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index d5818e4..8a92e98 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -114,4 +114,10 @@ true + + + + 1 diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index 587f245..2e02ca1 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -28,3 +28,6 @@ WIFI_FEATURE_IMU_DETECTION := true WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_FEATURE_HOSTAPD_11AX := true +PRODUCT_COPY_FILES += \ + device/google/tangorpro/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \ + device/google/tangorpro/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf diff --git a/wifi/p2p_supplicant.conf b/wifi/p2p_supplicant.conf new file mode 100644 index 0000000..4ec8453 --- /dev/null +++ b/wifi/p2p_supplicant.conf @@ -0,0 +1,10 @@ +driver_param=use_p2p_group_interface=1p2p_device=1 +update_config=1 +eapol_version=1 +ap_scan=1 +fast_reauth=1 +pmf=1 +p2p_add_cli_chan=1 +disable_scan_offload=1 +p2p_go_vht=1 +p2p_pref_chan=124:149, 115:36 diff --git a/wifi/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf new file mode 100644 index 0000000..6f274c1 --- /dev/null +++ b/wifi/wpa_supplicant_overlay.conf @@ -0,0 +1,10 @@ +sae_pwe=2 +driver_param=use_p2p_group_interface=1p2p_device=1 +disable_scan_offload=1 +wowlan_triggers=any +bss_max_count=512 +interworking=1 +hs20=1 +auto_interworking=0 +bss_no_flush_when_down=1 +btm_offload=1