commit 9d5eb0a2b71cab3bb2e60f3e0b12acdb69b582b4
author Emilian Peev <epeev@google.com> Wed Apr 18 07:49:55 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 18 07:49:55 2018 -0700
tree dff09c7711e42d67b24ec2d2dbf9dc07704a8e5b
parent 27750b855716aedae664a4b28a1660f4053396e4
parent 91c133891afca55e4f0386711d6614d993c85a20

Merge "Camera: Synchronize access to torch status map" into pi-dev am: 0c4ef750ac
am: 91c133891a

Change-Id: I09298dedda14324feb80c5245ea394c4d6e28ceb

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 714d50f..c87b5eb 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -243,6 +243,7 @@
     }
 
     if (mFlashlight->hasFlashUnit(id)) {
+        Mutex::Autolock al(mTorchStatusMutex);
         mTorchStatusMap.add(id, TorchModeStatus::AVAILABLE_OFF);
     }
 
@@ -253,6 +254,7 @@
 void CameraService::removeStates(const String8 id) {
     updateCameraNumAndIds();
     if (mFlashlight->hasFlashUnit(id)) {
+        Mutex::Autolock al(mTorchStatusMutex);
         mTorchStatusMap.removeItem(id);
     }