commit d1817707b74ca23725c2aeae97d5982fe465f9c5
author Ram Mohan M <ram.mohan@ittiam.com> Sun Oct 01 23:12:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Oct 01 23:12:16 2017 +0000
tree eb1eb9bcba895804336d74987be0d5b49492619c
parent 67fd6d8af8106509b0c80c76d4535f492435acd8
parent 99c319f781352e44d3450177eab45ae3b0c4a310

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

Change-Id: I151636a841c11310880601db6533d21ab0d8f7c0

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

diff --git a/media/omx/1.0/vts/functional/common/media_hidl_test_common.h b/media/omx/1.0/vts/functional/common/media_hidl_test_common.h
index e23d781..de043b2 100644
--- a/media/omx/1.0/vts/functional/common/media_hidl_test_common.h
+++ b/media/omx/1.0/vts/functional/common/media_hidl_test_common.h
@@ -126,8 +126,8 @@
         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 ==