Merge "Revert "wifi: Disable STA+SAP concurrency"" into udc-qpr-dev am: 8034adb36f

Original change: https://googleplex-android-review.googlesource.com/c/device/google/akita/+/24485709

Change-Id: Ibbd0ec7d3aa049ec54f2dfc083a56ce3944002f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hsiu-Chang Chen 2023-08-19 06:39:10 +00:00 committed by Automerger Merge Worker
commit 26b402f805
2 changed files with 1 additions and 5 deletions

View file

@ -267,7 +267,3 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=1 ro.vendor.build.svn=1
# Wifi SAP Interface Name
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.wifi.sap.interface=wlan1

View file

@ -23,7 +23,7 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211
BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_DRIVER := NL80211
# Wifi interface combination - {1 STA + 1 AP} or {1 STA + 1 P2P} # Wifi interface combination - {1 STA + 1 AP} or {1 STA + 1 P2P}
# or {1 STA + 1 NAN} # or {1 STA + 1 NAN}
WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN}, 1}}, {{{AP}, 1}} WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN, AP}, 1}}
WIFI_FEATURE_WIFI_EXT_HAL := true WIFI_FEATURE_WIFI_EXT_HAL := true
WIFI_FEATURE_IMU_DETECTION := true WIFI_FEATURE_IMU_DETECTION := true
# Avoid Wifi reset on MAC Address change # Avoid Wifi reset on MAC Address change