From c4464b7fee63d50e57d6ca00402d48a3c28cc0e1 Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Fri, 14 Dec 2012 14:16:35 -0800
Subject: [PATCH] Revert "Camera2: Fix a potential race condition in the
 readout thread"

The last fix incorrectly added a mutex lock which did not guard the appropriate
variables.

In fact it actually *introduced* a new race condition in a HAL test.

This reverts commit 6edd7ab4a4a8077f36767e7047b5d2c8fa0cf488.
---
 tools/emulator/system/camera/EmulatedFakeCamera2.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
index 29391a15f..bcbe2116a 100644
--- a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
+++ b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
@@ -1135,7 +1135,6 @@ void EmulatedFakeCamera2::ReadoutThread::setNextOperation(
         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();