summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Mohan M2017-10-01 18:12:16 -0500
committerandroid-build-merger2017-10-01 18:12:16 -0500
commitd1817707b74ca23725c2aeae97d5982fe465f9c5 (patch)
treeeb1eb9bcba895804336d74987be0d5b49492619c /media/omx/1.0
parent67fd6d8af8106509b0c80c76d4535f492435acd8 (diff)
parent99c319f781352e44d3450177eab45ae3b0c4a310 (diff)
downloadplatform-hardware-interfaces-d1817707b74ca23725c2aeae97d5982fe465f9c5.tar.gz
platform-hardware-interfaces-d1817707b74ca23725c2aeae97d5982fe465f9c5.tar.xz
platform-hardware-interfaces-d1817707b74ca23725c2aeae97d5982fe465f9c5.zip
Merge "omxvts: misplaced lock can cause race condition" into oc-mr1-dev
am: 99c319f781 Change-Id: I151636a841c11310880601db6533d21ab0d8f7c0
Diffstat (limited to 'media/omx/1.0')
-rw-r--r--media/omx/1.0/vts/functional/common/media_hidl_test_common.h2
1 files changed, 1 insertions, 1 deletions
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 e23d781b..de043b2c 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 @@ struct CodecObserver : public IOmxObserver {
126 android::Vector<BufferInfo>* iBuffers = nullptr, 126 android::Vector<BufferInfo>* iBuffers = nullptr,
127 android::Vector<BufferInfo>* oBuffers = nullptr) { 127 android::Vector<BufferInfo>* oBuffers = nullptr) {
128 int64_t finishBy = android::ALooper::GetNowUs() + timeoutUs; 128 int64_t finishBy = android::ALooper::GetNowUs() + timeoutUs;
129 android::Mutex::Autolock autoLock(msgLock);
130 for (;;) { 129 for (;;) {
130 android::Mutex::Autolock autoLock(msgLock);
131 android::List<Message>::iterator it = msgQueue.begin(); 131 android::List<Message>::iterator it = msgQueue.begin();
132 while (it != msgQueue.end()) { 132 while (it != msgQueue.end()) {
133 if (it->type == 133 if (it->type ==