commit 6edd7ab4a4a8077f36767e7047b5d2c8fa0cf488
author Igor Murashkin <iam@google.com> Fri Dec 07 12:34:20 2012 -0800
committer Igor Murashkin <iam@google.com> Fri Dec 07 12:34:20 2012 -0800
tree 38f9df2339c93fea70d5a38af0ebbe890b74c12d
parent 0825f8b65bc053eead1ca4aa44dee77b40f90f12

Camera2: Fix a potential race condition in the readout thread

Change-Id: Ie4475c8433eaad7545430f7e01e222d074180e0e

tools/emulator/system/camera/EmulatedFakeCamera2.cpp

diff --git a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
index bcbe211..29391a1 100644
--- a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
+++ b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
@@ -1135,6 +1135,7 @@
         camera_metadata_t *request,
         Buffers *buffers) {
     Mutex::Autolock lock(mInputMutex);
+    Mutex::Autolock iLock(mInternalsMutex);
     if ( !readyForNextCapture() ) {
         ALOGE("In flight queue full, dropping captures");
         mParent->signalError();