diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-03-25 19:09:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 19:09:34 +0000 |
| commit | a1aaaf86cd04eabaf961a30d7b0a9fa857089862 (patch) | |
| tree | 0a5552a3fb27bda556afa0cd69ee672fc6f499ac /services/camera/libcameraservice/CameraService.cpp | |
| parent | 5c679d41714e42f153f6aeb492df54510a195bc1 (diff) | |
| parent | 4f53fe74051026e6635ba5bdbed4f1898cb66028 (diff) | |
| download | frameworks_av-a1aaaf86cd04eabaf961a30d7b0a9fa857089862.zip frameworks_av-a1aaaf86cd04eabaf961a30d7b0a9fa857089862.tar.gz frameworks_av-a1aaaf86cd04eabaf961a30d7b0a9fa857089862.tar.bz2 | |
am 4f53fe74: Merge "CameraService: deadlock fix"
* commit '4f53fe74051026e6635ba5bdbed4f1898cb66028':
CameraService: deadlock fix
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
| -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 5cbbde9..9ce7daf 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1169,6 +1169,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; } |