diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-09-02 17:49:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-02 17:49:32 +0000 |
| commit | ef7826692df89514701d12dfbfc31bec3814cf95 (patch) | |
| tree | 6e91d3217d379f14ad217544297291ff7954f78f /services/camera/libcameraservice/CameraService.h | |
| parent | 5dc3d9928f85580a2351925b5f11ff0189524c39 (diff) | |
| parent | fe751bea0d3eedd6e817aebf4e457425b82e7117 (diff) | |
| download | frameworks_av-ef7826692df89514701d12dfbfc31bec3814cf95.zip frameworks_av-ef7826692df89514701d12dfbfc31bec3814cf95.tar.gz frameworks_av-ef7826692df89514701d12dfbfc31bec3814cf95.tar.bz2 | |
am fe751bea: Camera: Fix flashlight deadlock
* commit 'fe751bea0d3eedd6e817aebf4e457425b82e7117':
Camera: Fix flashlight deadlock
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 894767a..a8c6b6c 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -657,8 +657,10 @@ private: sp<CameraFlashlight> mFlashlight; // guard mTorchStatusMap Mutex mTorchStatusMutex; - // guard mTorchClientMap, mTorchUidMap + // guard mTorchClientMap Mutex mTorchClientMapMutex; + // guard mTorchUidMap + Mutex mTorchUidMapMutex; // camera id -> torch status KeyedVector<String8, ICameraServiceListener::TorchStatus> mTorchStatusMap; // camera id -> torch client binder |