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

Commit a702fae2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: don't stop preview on disconnecting device" am: fd2fb97a am:... 

Merge "Camera: don't stop preview on disconnecting device" am: fd2fb97a am: 800c4f39 am: 3bdd6d99

Change-Id: I453a93f04449a157f1757bb101c8ebccf10c8f96
parents d6c0dda9 3bdd6d99

services/camera/libcameraservice/api1/Camera2Client.cpp

+4 −0
Original line number Diff line number Diff line
@@ -733,6 +733,10 @@ status_t Camera2Client::startPreviewL(Parameters &params, bool restart) { 


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



    if (params.state == Parameters::DISCONNECTED) {

        ALOGE("%s: Camera %d has been disconnected.", __FUNCTION__, mCameraId);

        return INVALID_OPERATION;

    }

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

                    params.state == Parameters::RECORD ||

                    params.state == Parameters::VIDEO_SNAPSHOT)