Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 10:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305 am: 3e5ee9a6e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24685603

Change-Id: I277860732d04b798fc05a0701d2d944e8cc432c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ryan Prichard
2023-09-07 22:10:17 +00:00
committed by Automerger Merge Worker
parent ff7c699b31 3e5ee9a6e6
commit 5742e2ba25
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/aidl/default/wifi_feature_flags.cpp
View File

@@ -122,6 +122,7 @@ std::vector<IWifiChip::ChipConcurrencyCombination> legacyToChipConcurrencyComboL
#define AP IfaceConcurrencyType::AP
#define AP_BRIDGED IfaceConcurrencyType::AP_BRIDGED
#define P2P IfaceConcurrencyType::P2P
#undef NAN // undefine NAN from math.h
#define NAN IfaceConcurrencyType::NAN_IFACE
static const std::vector<IWifiChip::ChipMode> kChipModesPrimary{
{kMainModeId, legacyToChipConcurrencyComboList({WIFI_HAL_INTERFACE_COMBINATIONS})},