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

Commit 3f734480 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "camera2: Fix race with stream deletion during disconnect."

parents 9e2c298d dfe71558

services/camera/libcameraservice/api1/Camera2Client.cpp

+8 −6
Original line number Diff line number Diff line
@@ -407,12 +407,6 @@ void Camera2Client::disconnect() { 
        l.mParameters.state = Parameters::DISCONNECTED;

    }



    mStreamingProcessor->deletePreviewStream();

    mStreamingProcessor->deleteRecordingStream();

    mJpegProcessor->deleteStream();

    mCallbackProcessor->deleteStream();

    mZslProcessor->deleteStream();



    mStreamingProcessor->requestExit();

    mFrameProcessor->requestExit();

    mCaptureSequencer->requestExit();
@@ -429,6 +423,14 @@ void Camera2Client::disconnect() { 
    mZslProcessorThread->join();

    mCallbackProcessor->join();



    ALOGV("Camera %d: Deleting streams", mCameraId);



    mStreamingProcessor->deletePreviewStream();

    mStreamingProcessor->deleteRecordingStream();

    mJpegProcessor->deleteStream();

    mCallbackProcessor->deleteStream();

    mZslProcessor->deleteStream();



    ALOGV("Camera %d: Disconnecting device", mCameraId);



    mDevice->disconnect();