mirror of
https://github.com/Evolution-X/hardware_interfaces
synced 2026-02-01 15:58:43 +00:00
Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
140534a783
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user