diff options
| author | Kalle Lampila <kallex.lampila@intel.com> | 2013-04-30 15:27:19 +0300 |
|---|---|---|
| committer | Xiaokang Qin <xiaokang.qin@intel.com> | 2014-03-25 04:29:31 -0700 |
| commit | 6ec3a15257ca2b56b675a610aef43cc4ec6aaf00 (patch) | |
| tree | f28808875e71939c1c9e0d30e69a283dac93b9db /services/camera | |
| parent | 3d7c500234d98464d37ba3e1b65cea763b316b69 (diff) | |
| download | frameworks_av-6ec3a15257ca2b56b675a610aef43cc4ec6aaf00.zip frameworks_av-6ec3a15257ca2b56b675a610aef43cc4ec6aaf00.tar.gz frameworks_av-6ec3a15257ca2b56b675a610aef43cc4ec6aaf00.tar.bz2 | |
CameraService: deadlock fix
Release lock before return from CameraService::dump()
Change-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774
Signed-off-by: Kalle Lampila <kallex.lampila@intel.com>
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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<String16>& args) { if (!mModule) { result = String8::format("No camera module available!\n"); write(fd, result.string(), result.size()); + if (locked) mServiceLock.unlock(); return NO_ERROR; } |