summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2013-07-03 13:54:40 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2013-07-03 13:54:40 +0800
commita3b087981081da148bec3776d80b6047a5fb5b29 (patch)
treecfbc42aef9e6f8bd1d0264179f73fef0cea66d1d
parent378fa719a208074c2a1b0a7c7b86c9abd79a1065 (diff)
CameraClient: delete the lock in the takePicturelinaro_android_4.2.2
The lock is implemented in the hardware layer, so we don't need to do it here, otherwise we will not get the lock to take picture forever Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rw-r--r--services/camera/libcameraservice/CameraClient.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp
index b930c02f..ac9fcd81 100644
--- a/services/camera/libcameraservice/CameraClient.cpp
+++ b/services/camera/libcameraservice/CameraClient.cpp
@@ -509,7 +509,6 @@ status_t CameraClient::cancelAutoFocus() {
status_t CameraClient::takePicture(int msgType) {
LOG1("takePicture (pid %d): 0x%x", getCallingPid(), msgType);
- Mutex::Autolock lock(mLock);
status_t result = checkPidAndHardware();
if (result != NO_ERROR) return result;