Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into stage-aosp-udc-ts-dev am: e410f8ccc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24060409
Change-Id: I0deb0bdd1825027a80ab90dcbf9fe8e633effe7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp b/wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp
index 95bcec7..738e72c 100644
--- a/wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp
+++ b/wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp
@@ -123,7 +123,7 @@
// 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 @@
}
inline bool receivedCallback(CallbackType waitForCallbackType) {
- return callback_event_bitmap_ & (0x1 << waitForCallbackType);
+ return callback_event_bitmap_ & (UINT64_C(0x1) << waitForCallbackType);
}
class WifiNanIfaceEventCallback : public BnWifiNanIfaceEventCallback {