From 6ec3a15257ca2b56b675a610aef43cc4ec6aaf00 Mon Sep 17 00:00:00 2001 From: Kalle Lampila Date: Tue, 30 Apr 2013 15:27:19 +0300 Subject: CameraService: deadlock fix Release lock before return from CameraService::dump() Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774 Signed-off-by: Kalle Lampila --- services/camera/libcameraservice/CameraService.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'services/camera') 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 @@ status_t CameraService::dump(int fd, const Vector& args) { if (!mModule) { result = String8::format("No camera module available!\n"); write(fd, result.string(), result.size()); + if (locked) mServiceLock.unlock(); return NO_ERROR; } -- cgit v1.1