Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

p2p: fix p2p configuration

Browse source 
The correct path should be under /data,
or it is not writable.

wpa_supplicant now support p2p overlay configuration, a unified
wpa_supplicant init entry can be used.

Bug: 238601241
Test: create a group and check this group is persisted
      after reboot
Merged-In: I3c5523626de22c26cb562c03e9fbd7aabf6d98e7
Change-Id: I3c5523626de22c26cb562c03e9fbd7aabf6d98e7
This commit is contained in:
Jimmy Chen 2022-07-11 18:54:12 +08:00
parent dc68b3a2cd
commit 3749b75764
5 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Android.mk
View file

@ -32,7 +32,7 @@ $(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_prof
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/gs101,media_codecs_performance.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/gs101,device_state_configuration.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/gs101,task_profiles.json,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,p2p_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/gs101,p2p_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,device/google/gs101,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))

11
conf/init.gs101.rc
View file

@ -628,17 +628,6 @@ service abox /vendor/bin/main_abox 17c50000.abox
group audioserver group audioserver
seclabel u:r:abox:s0 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 aidl android.hardware.wifi.supplicant.ISupplicant/default
socket wpa_wlan0 dgram 660 wifi wifi
class main
disabled
oneshot
# GPS # GPS
service lhd /vendor/bin/hw/lhd /vendor/etc/gnss/lhd.conf service lhd /vendor/bin/hw/lhd /vendor/etc/gnss/lhd.conf
class main class main

2
device.mk
View file

@ -716,7 +716,7 @@ PRODUCT_CHARACTERISTICS := nosdcard
# WPA SUPPLICANT # WPA SUPPLICANT
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/gs101/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \ device/google/gs101/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
device/google/gs101/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf device/google/gs101/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
# WIFI COEX # WIFI COEX

2
wifi/BoardConfig-wifi.mk
View file

@ -30,4 +30,4 @@ WIFI_FEATURE_IMU_DETECTION := true
WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true
WIFI_FEATURE_HOSTAPD_11AX := true WIFI_FEATURE_HOSTAPD_11AX := true
BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true
WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true

0
wifi/p2p_supplicant.conf → wifi/p2p_supplicant_overlay.conf
View file