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

Commit c0a0bf9c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Binder NDK tests: use std::mutex, not android::Mutex" into main

parents 8a56df68 4532c984
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -826,22 +826,22 @@ TEST(NdkBinder, GetAndVerifyScopedAIBinder_Weak) {

class MyResultReceiver : public BnResultReceiver {
   public:
    Mutex mMutex;
    Condition mCondition;
    std::mutex mMutex;
    std::condition_variable mCondition;
    bool mHaveResult = false;
    int32_t mResult = 0;

    virtual void send(int32_t resultCode) {
        AutoMutex _l(mMutex);
        std::unique_lock<std::mutex> _l(mMutex);
        mResult = resultCode;
        mHaveResult = true;
        mCondition.signal();
        mCondition.notify_one();
    }

    int32_t waitForResult() {
        AutoMutex _l(mMutex);
        std::unique_lock<std::mutex> _l(mMutex);
        while (!mHaveResult) {
            mCondition.wait(mMutex);
            mCondition.wait(_l);
        }
        return mResult;
    }