diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-03-25 18:25:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 18:25:13 +0000 |
| commit | 1cc3f85de70e813998102bf572caad3691a6b6a2 (patch) | |
| tree | 58d2dce7ce40bd51e3091b059c17b81eb9defc5d /services | |
| parent | 7b1524d4e866b53ab0d02a59cc6ccb133bd98f77 (diff) | |
| parent | 4f53fe74051026e6635ba5bdbed4f1898cb66028 (diff) | |
| download | frameworks_av-1cc3f85de70e813998102bf572caad3691a6b6a2.zip frameworks_av-1cc3f85de70e813998102bf572caad3691a6b6a2.tar.gz frameworks_av-1cc3f85de70e813998102bf572caad3691a6b6a2.tar.bz2 | |
am 4f53fe74: Merge "CameraService: deadlock fix"
* commit '4f53fe74051026e6635ba5bdbed4f1898cb66028':
CameraService: deadlock fix
Diffstat (limited to 'services')
| -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; } |