commit 29cdd9bb46437ab580deabf33b2242106e0090b6
author Eino-Ville Talvala <etalvala@google.com> Tue Mar 25 21:22:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 25 21:22:52 2014 +0000
tree dd68d54734eb8fe5f4aa749f7f9d55dd5b138de7
parent 1392eb3d1802e9f894f87d7a7387207d1b6faca1
parent a1aaaf86cd04eabaf961a30d7b0a9fa857089862

am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"

* commit 'a1aaaf86cd04eabaf961a30d7b0a9fa857089862':
  CameraService: deadlock fix

services/camera/libcameraservice/CameraService.cpp

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