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

Commit 81d472ef authored by Jinguang Dong's avatar Jinguang Dong Committed by android-build-merger
Browse files

Merge "Camera3: Add missing mTriggerMutex lock" am: ad4663c5 am: fa43b546 am: 51c4a65f 

am: ce85a697

Change-Id: I0b2995ef33ae80eebb32085fd42a81d868aeb8aa
parents 6507185f ce85a697

services/camera/libcameraservice/device3/Camera3Device.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2962,6 +2962,8 @@ status_t Camera3Device::RequestThread::clear( 
        }

    }

    mRequestQueue.clear();



    Mutex::Autolock al(mTriggerMutex);

    mTriggerMap.clear();

    if (lastFrameNumber != NULL) {

        *lastFrameNumber = mRepeatingLastFrameNumber;