commit 572a0860387a5379f4f1a0cfe340daa1f4f34e8e
author Igor Murashkin <iam@google.com> Tue Dec 18 16:07:06 2012 -0800
committer Igor Murashkin <iam@google.com> Thu Dec 20 16:56:34 2012 -0800
tree 26f4cc030c939ce76b81dfd360e184854490c442
parent 09167dc1121b5b7124b27f238a9943cab171535f

Camera2: Test: fix deadlock in isStreamInUse

Change-Id: I2ac46303e96c3ccaaa0f76555b89bbeed45a3919

tools/emulator/system/camera/EmulatedFakeCamera2.cpp

diff --git a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
index ca01266..f1ff008 100644
--- a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
+++ b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
@@ -1153,6 +1153,8 @@
 }
 
 bool EmulatedFakeCamera2::ReadoutThread::isStreamInUse(uint32_t id) {
+    // acquire in same order as threadLoop
+    Mutex::Autolock iLock(mInternalsMutex);
     Mutex::Autolock lock(mInputMutex);
 
     size_t i = mInFlightHead;
@@ -1164,7 +1166,6 @@
         i = (i + 1) % kInFlightQueueSize;
     }
 
-    Mutex::Autolock iLock(mInternalsMutex);
 
     if (mBuffers != NULL) {
         for (i = 0; i < mBuffers->size(); i++) {