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

Commit 13f5b25c authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value... 

am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread

Merge commit 'd152c1c7'

* commit 'd152c1c7':
  Replace CHECK with a failure return value when mCamera->setParameters() fails
parents 5bac1cc0 d152c1c7

media/libmediaplayerservice/StagefrightRecorder.cpp

+7 −1
Original line number Diff line number Diff line
@@ -899,7 +899,11 @@ status_t StagefrightRecorder::setupCameraSource() { 


    params.setPreviewFrameRate(mFrameRate);

    String8 s = params.flatten();

    CHECK_EQ(OK, mCamera->setParameters(s));

    if (OK != mCamera->setParameters(s)) {

        LOGE("Could not change settings."

             " Someone else is using camera %d?", mCameraId);

        return -EBUSY;

    }

    CameraParameters newCameraParams(mCamera->getParameters());



    // Check on video frame size
@@ -921,6 +925,8 @@ status_t StagefrightRecorder::setupCameraSource() { 
             "frame rate is %d", mFrameRate, frameRate);

    }



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

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

    CHECK_EQ(OK, mCamera->setPreviewDisplay(mPreviewSurface));

    IPCThreadState::self()->restoreCallingIdentity(token);

    return OK;