Merge "Camera: don't stop preview on disconnecting device" into rvc-dev

4 years ago · 19c458805f
parent a3e42f87b6 28dcd1c444
commit 19c458805f
1 changed files with 4 additions and 0 deletions
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@ -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)