am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev

* commit '10665f4b0c5dc94ce7cceaa1fd60a8c29b384114':
  Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE
This commit is contained in:
Igor Murashkin
2013-01-10 13:35:35 -08:00
committed by Android Git Automerger

View File

@@ -1136,6 +1136,7 @@ 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();