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

Commit d656a4be authored by Igor Murashkin's avatar Igor Murashkin Committed by Android (Google) Code Review
Browse files

Merge "camera: Fix deadlock when sending callbacks during disconnect" into klp-dev

parents 9404fa6a 4fb55c15

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+4 −6
Original line number Diff line number Diff line
@@ -500,14 +500,12 @@ void CameraDeviceClient::onFrameAvailable(int32_t frameId, 
    ATRACE_CALL();

    ALOGV("%s", __FUNCTION__);



    Mutex::Autolock icl(mBinderSerializationLock);

    SharedCameraCallbacks::Lock l(mSharedCameraCallbacks);



    if (mRemoteCallback != NULL) {

    // Thread-safe. No lock necessary.

    sp<ICameraDeviceCallbacks> remoteCb = mRemoteCallback;

    if (remoteCb != NULL) {

        ALOGV("%s: frame = %p ", __FUNCTION__, &frame);

        mRemoteCallback->onResultReceived(frameId, frame);

        remoteCb->onResultReceived(frameId, frame);

    }



}



// TODO: move to Camera2ClientBase