commit 6ec3a15257ca2b56b675a610aef43cc4ec6aaf00
author Kalle Lampila <kallex.lampila@intel.com> Tue Apr 30 15:27:19 2013 +0300
committer Xiaokang Qin <xiaokang.qin@intel.com> Tue Mar 25 04:29:31 2014 -0700
tree f28808875e71939c1c9e0d30e69a283dac93b9db
parent 3d7c500234d98464d37ba3e1b65cea763b316b69

CameraService: deadlock fix

Release lock before return from CameraService::dump()

Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774
Signed-off-by: Kalle Lampila <kallex.lampila@intel.com>

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index fbc56b1..141b1b3 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1159,6 +1159,7 @@
         if (!mModule) {
             result = String8::format("No camera module available!\n");
             write(fd, result.string(), result.size());
+            if (locked) mServiceLock.unlock();
             return NO_ERROR;
         }