Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5ba9b1a authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "Undefine NAN before defining it again" into aosp-main-future am:... 

Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe33 am: 3e5ee9a6 am: 5742e2ba

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



Change-Id: I262b7ff132cfcd1bd8d21d6528d13d76fc075998
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d06e491f 5742e2ba

wifi/aidl/default/wifi_feature_flags.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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})},