diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-03-25 18:14:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-25 18:14:01 +0000 |
| commit | 4f53fe74051026e6635ba5bdbed4f1898cb66028 (patch) | |
| tree | f28808875e71939c1c9e0d30e69a283dac93b9db | |
| parent | 3d7c500234d98464d37ba3e1b65cea763b316b69 (diff) | |
| parent | 6ec3a15257ca2b56b675a610aef43cc4ec6aaf00 (diff) | |
| download | frameworks_av-4f53fe74051026e6635ba5bdbed4f1898cb66028.zip frameworks_av-4f53fe74051026e6635ba5bdbed4f1898cb66028.tar.gz frameworks_av-4f53fe74051026e6635ba5bdbed4f1898cb66028.tar.bz2 | |
Merge "CameraService: deadlock fix"
| -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; } |