BOBtheBlinker/android_device_oneplus_dre
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dre: Update WCNSS configuration from DE2117_11.C.15

Browse source 
* OnePlus reads MAC address from QMI DMS now.

 * Since that was the only custom change, move back
   to proprietary files.

This commit is a partial revert of 83d0538609.

Change-Id: I9e89def5258f9085e7169a1a6753cbdabd1d548c
This commit is contained in:
Alexander Koskovich 2022-04-17 15:10:18 -07:00 committed by Albert Tang
parent 273c9562ff
commit a8fffbcca3
5 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.mk
View file

@ -98,7 +98,7 @@ WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld
$(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
@echo "Creating wifi firmware symlinks: $@" @echo "Creating wifi firmware symlinks: $@"
@mkdir -p $@ @mkdir -p $@
$(hide) ln -sf /mnt/vendor/persist/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini $(hide) ln -sf /odm/etc/wifi/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
$(hide) ln -sf /mnt/vendor/persist/wlan_mac.bin $@/wlan_mac.bin $(hide) ln -sf /mnt/vendor/persist/wlan_mac.bin $@/wlan_mac.bin
ALL_DEFAULT_INSTALLED_MODULES += $(ACDBDATA_SYMLINKS) $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS) ALL_DEFAULT_INSTALLED_MODULES += $(ACDBDATA_SYMLINKS) $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS)

4
device.mk
View file

@ -540,10 +540,6 @@ PRODUCT_PACKAGES += \
wpa_supplicant \ wpa_supplicant \
wpa_supplicant.conf wpa_supplicant.conf
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
$(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml \ frameworks/native/data/etc/android.hardware.wifi.aware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.aware.xml \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \

4
proprietary-files.txt
View file

@ -1798,8 +1798,10 @@ vendor/lib64/libtrustedapploader.so
# WiFi # WiFi
odm/etc/wifi/regdb.bin odm/etc/wifi/regdb.bin
odm/etc/wifi/WCNSS_qcom_cfg.ini
vendor/bin/cnss-daemon vendor/bin/cnss-daemon
vendor/etc/wifi/WCNSS_qcom_cfg.ini vendor/etc/wifi/p2p_supplicant_overlay.conf
vendor/etc/wifi/wpa_supplicant_overlay.conf
# WiFi Display # WiFi Display
-system/framework/WfdCommon.jar -system/framework/WfdCommon.jar

4
wifi/p2p_supplicant_overlay.conf
View file

@ -1,4 +0,0 @@
disable_scan_offload=1
p2p_no_group_iface=1
persistent_reconnect=1
bss_max_count=400

8
wifi/wpa_supplicant_overlay.conf
View file

@ -1,8 +0,0 @@
disable_scan_offload=1
p2p_disabled=1
tdls_external_control=1
wowlan_triggers=magic_pkt
bss_max_count=400
interworking=1
config_methods=virtual_display virtual_push_button keypad
driver_param="no_rrm=1 use_p2p_group_interface=1"