Merge "Camera: Synchronize access to torch status map" into pi-dev (91c13389) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraService.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,7 @@ void CameraService::addStates(const String8 id) {
		}

		if (mFlashlight->hasFlashUnit(id)) {
		Mutex::Autolock al(mTorchStatusMutex);
		mTorchStatusMap.add(id, TorchModeStatus::AVAILABLE_OFF);
		}

		@@ -253,6 +254,7 @@ void CameraService::addStates(const String8 id) {
		void CameraService::removeStates(const String8 id) {
		updateCameraNumAndIds();
		if (mFlashlight->hasFlashUnit(id)) {
		Mutex::Autolock al(mTorchStatusMutex);
		mTorchStatusMap.removeItem(id);
		}