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

Commit 969e5868 authored by Ram Mohan M's avatar Ram Mohan M Committed by android-build-merger
Browse files

Merge "omxvts: misplaced lock can cause race condition" into oc-mr1-dev am: 99c319f7 

am: d1817707

Change-Id: I3284ba15562b3aab4b705e5f1c776a5169d143bd
parents 8b77593b d1817707

media/omx/1.0/vts/functional/common/media_hidl_test_common.h

+1 −1
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ struct CodecObserver : public IOmxObserver { 
        android::Vector<BufferInfo>* iBuffers = nullptr,

        android::Vector<BufferInfo>* oBuffers = nullptr) {

        int64_t finishBy = android::ALooper::GetNowUs() + timeoutUs;

        android::Mutex::Autolock autoLock(msgLock);

        for (;;) {

            android::Mutex::Autolock autoLock(msgLock);

            android::List<Message>::iterator it = msgQueue.begin();

            while (it != msgQueue.end()) {

                if (it->type ==