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

Commit ce85a697 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

Change-Id: I0fbb1098a246db4dd2b0a6b9720dea275be23a42
parents 01abec87 51c4a65f

services/camera/libcameraservice/device3/Camera3Device.cpp

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

    }

    mRequestQueue.clear();



    Mutex::Autolock al(mTriggerMutex);

    mTriggerMap.clear();

    if (lastFrameNumber != NULL) {

        *lastFrameNumber = mRepeatingLastFrameNumber;