commit 551cec544652783e3342c18386f64cee22412b60
author Glenn Kasten <gkasten@google.com> Wed Mar 26 17:38:35 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 26 17:38:35 2014 +0000
tree 816a6acded4e9433fd30916ff71c161fdcc54a5e
parent 172a7a965c21c29ee38c77d53d91780c7dca09bf
parent bcefec31bd1346133052356ffc8d7ac8a5b13fab

Merge "Document AudioFlinger::nextUniqueId()"

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