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

Commit c52198dc authored by Wonsik Kim's avatar Wonsik Kim Committed by Android (Google) Code Review
Browse files

Merge "stagefright: add null guard for CameraSource::stopCameraRecording" into nyc-dev

parents d25c4552 2da037b4

media/libstagefright/CameraSource.cpp

+7 −3
Original line number Diff line number Diff line
@@ -792,12 +792,16 @@ status_t CameraSource::start(MetaData *meta) { 
void CameraSource::stopCameraRecording() {

    ALOGV("stopCameraRecording");

    if (mCameraFlags & FLAGS_HOT_CAMERA) {

        if (mCameraRecordingProxy != 0) {

            mCameraRecordingProxy->stopRecording();

        }

    } else {

        if (mCamera != 0) {

            mCamera->setListener(NULL);

            mCamera->stopRecording();

        }

    }

}



void CameraSource::releaseCamera() {

    ALOGV("releaseCamera");