tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into stage-aosp-udc-ts-dev am: e410f8ccc0 am: f479d8837b

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

Change-Id: Ie655498707b4c3b3ad84652804f5a573359ef8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gabriel Biren 2023-07-14 22:14:14 +00:00 committed by Automerger Merge Worker
commit 065901cf4d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp
View file

@ -123,7 +123,7 @@ class WifiNanIfaceAidlTest : public testing::TestWithParam<std::string> {
// Used as a mechanism to inform the test about data/event callbacks.
inline void notify(CallbackType callbackType) {
std::unique_lock<std::mutex> lock(mtx_);
callback_event_bitmap_ |= (0x1 << callbackType);
callback_event_bitmap_ |= (UINT64_C(0x1) << callbackType);
cv_.notify_one();
}
@ -143,7 +143,7 @@ class WifiNanIfaceAidlTest : public testing::TestWithParam<std::string> {
}
inline bool receivedCallback(CallbackType waitForCallbackType) {
return callback_event_bitmap_ & (0x1 << waitForCallbackType);
return callback_event_bitmap_ & (UINT64_C(0x1) << waitForCallbackType);
}
class WifiNanIfaceEventCallback : public BnWifiNanIfaceEventCallback {