summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Mohan M2017-10-01 18:14:12 -0500
committerandroid-build-merger2017-10-01 18:14:12 -0500
commit969e586842019d0b86e7a32e440f72bf0bf55c11 (patch)
tree7f455453935d294858d82fa0717a3c9029a906a9 /media/omx/1.0
parent8b77593b0d5b98d1b0bbabc15640da85e5f2286f (diff)
parentd1817707b74ca23725c2aeae97d5982fe465f9c5 (diff)
downloadplatform-hardware-interfaces-969e586842019d0b86e7a32e440f72bf0bf55c11.tar.gz
platform-hardware-interfaces-969e586842019d0b86e7a32e440f72bf0bf55c11.tar.xz
platform-hardware-interfaces-969e586842019d0b86e7a32e440f72bf0bf55c11.zip
Merge "omxvts: misplaced lock can cause race condition" into oc-mr1-dev am: 99c319f781
am: d1817707b7 Change-Id: I3284ba15562b3aab4b705e5f1c776a5169d143bd
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 ==