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

Commit 51c4a65f 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

Change-Id: I588e89df0dd601c3f3ca531b2ce2b2b997335cee
parents 51ae9199 fa43b546

services/camera/libcameraservice/device3/Camera3Device.cpp

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

    }

    mRequestQueue.clear();



    Mutex::Autolock al(mTriggerMutex);

    mTriggerMap.clear();

    if (lastFrameNumber != NULL) {

        *lastFrameNumber = mRepeatingLastFrameNumber;