commit 969e586842019d0b86e7a32e440f72bf0bf55c11
author Ram Mohan M <ram.mohan@ittiam.com> Sun Oct 01 23:14:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sun Oct 01 23:14:12 2017 +0000
tree 7f455453935d294858d82fa0717a3c9029a906a9
parent 8b77593b0d5b98d1b0bbabc15640da85e5f2286f
parent d1817707b74ca23725c2aeae97d5982fe465f9c5

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

Change-Id: I3284ba15562b3aab4b705e5f1c776a5169d143bd

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 ==