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

Commit b3570568 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am 9c8714da: am e6478de7: Camera2/3: Avoid shutdown race in callback processor. 

* commit '9c8714da':
  Camera2/3: Avoid shutdown race in callback processor.
parents 078a5405 9c8714da

services/camera/libcameraservice/camera2/CallbackProcessor.cpp

+4 −1
Original line number Diff line number Diff line
@@ -399,6 +399,9 @@ status_t CallbackProcessor::processNewCallback(sp<Camera2Client> &client) { 


        ALOGV("%s: Freeing buffer", __FUNCTION__);

        mCallbackConsumer->unlockBuffer(imgBuffer);



        // mCallbackHeap may get freed up once input mutex is released

        callbackHeap = mCallbackHeap;

    }



    // Call outside parameter lock to allow re-entrancy from notification
@@ -409,7 +412,7 @@ status_t CallbackProcessor::processNewCallback(sp<Camera2Client> &client) { 
            ALOGV("%s: Camera %d: Invoking client data callback",

                    __FUNCTION__, mId);

            l.mRemoteCallback->dataCallback(CAMERA_MSG_PREVIEW_FRAME,

                    mCallbackHeap->mBuffers[heapIdx], NULL);

                    callbackHeap->mBuffers[heapIdx], NULL);

        }

    }