From 3dec7d563a2f3e1eb967ce2054a00b6620e3558c Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 2 Mar 2009 22:54:33 -0800
Subject: auto import from //depot/cupcake/@137055

---
 camera/libcameraservice/CameraService.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'camera/libcameraservice/CameraService.h')

diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h
index d9b7927..812b928 100644
--- a/camera/libcameraservice/CameraService.h
+++ b/camera/libcameraservice/CameraService.h
@@ -172,6 +172,9 @@ private:
         // for a callback from CameraHardwareInterface.  If this
         // happens, it will cause a deadlock.
         mutable     Mutex                       mSurfaceLock;
+        // mBufferLock synchronizes buffer registration between takePicture() 
+        // and yuvPictureCallback().
+        mutable     Mutex                       mBufferLock;
         mutable     Condition                   mReady;
                     sp<CameraService>           mCameraService;
                     sp<ISurface>                mSurface;
-- 
cgit v1.1