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

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

am a14be593: Camera2: Don\'t error out of startPreview when already recording. 

* commit 'a14be593':
  Camera2: Don't error out of startPreview when already recording.
parents f84ae129 411ddcc4

services/camera/libcameraservice/Camera2Client.cpp

+7 −4
Original line number Diff line number Diff line
@@ -611,10 +611,13 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 


    ALOGV("%s: state == %d, restart = %d", __FUNCTION__, params.state, restart);



    if (params.state == Parameters::PREVIEW && !restart) {

        // Succeed attempt to re-enter preview state

        ALOGI("%s: Not starting preview; already in preview state.",

              __FUNCTION__);

    if ( (params.state == Parameters::PREVIEW ||

                    params.state == Parameters::RECORD ||

                    params.state == Parameters::VIDEO_SNAPSHOT)

            && !restart) {

        // Succeed attempt to re-enter a streaming state

        ALOGI("%s: Camera %d: Preview already active, ignoring restart",

                __FUNCTION__, mCameraId);

        return OK;

    }

    if (params.state > Parameters::PREVIEW && !restart) {