commit 4f53fe74051026e6635ba5bdbed4f1898cb66028
author Eino-Ville Talvala <etalvala@google.com> Tue Mar 25 18:14:01 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 25 18:14:01 2014 +0000
tree f28808875e71939c1c9e0d30e69a283dac93b9db
parent 3d7c500234d98464d37ba3e1b65cea763b316b69
parent 6ec3a15257ca2b56b675a610aef43cc4ec6aaf00

Merge "CameraService: deadlock fix"

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;
         }