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

Commit fee2252a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CameraSource: Remove CHECK if set preview target fails with... 

Merge "CameraSource: Remove CHECK if set preview target fails with CameraSource" into tm-dev am: e668d083 am: 713095b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18123909



Change-Id: Ic4f789739a591b65f5f8ee17c199303ee3d47e92
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5542a4ab 713095b4

media/libstagefright/CameraSource.cpp

+5 −3
Original line number Diff line number Diff line
@@ -564,9 +564,11 @@ status_t CameraSource::initWithCameraAccess( 
    // Set the preview display. Skip this if mSurface is null because

    // applications may already set a surface to the camera.

    if (mSurface != NULL) {

        // This CHECK is good, since we just passed the lock/unlock

        // check earlier by calling mCamera->setParameters().

        CHECK_EQ((status_t)OK, mCamera->setPreviewTarget(mSurface));

        // Surface may be set incorrectly or could already be used even if we just

        // passed the lock/unlock check earlier by calling mCamera->setParameters().

        if ((err = mCamera->setPreviewTarget(mSurface)) != OK) {

            return err;

        }

    }



    // Use buffer queue to receive video buffers from camera