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

am: d1817707b7

Change-Id: I3284ba15562b3aab4b705e5f1c776a5169d143bd
This commit is contained in:
Ram Mohan M 2017-10-01 23:14:12 +00:00 committed by android-build-merger
commit 969e586842

View file

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