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

Commit 065901cf authored by Gabriel Biren's avatar Gabriel Biren Committed by Automerger Merge Worker
Browse files

Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into... 

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

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



Change-Id: Ie655498707b4c3b3ad84652804f5a573359ef8da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e20b3b7 f479d883

wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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 {