Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d5eb0a2 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

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

am: 91c13389

Change-Id: I09298dedda14324feb80c5245ea394c4d6e28ceb
parents 27750b85 91c13389

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);

    }