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

Commit 4c3eeb41 authored by Gabriel Biren's avatar Gabriel Biren
Browse files

Use a 64-bit instance of 0x1 when creating 

the event bitmask.

Comments on ag/24025770 suggest that the bit
shift will lead to undefined behavior for
event codes greater than 31.

Bug: 290318208
Test: atest VtsHalWifiNanIfaceTargetTest
       # manually set some of the expected
       # events codes to > 31 to verify that
       # the bit shift works as expected
Change-Id: I09e11dac8acf90baf047e24cebe1d01970b1dc8a
parent 4a704165

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 {