commit df14304ef839ceb1ac4e54fbc6d9474c625025d9
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Feb 05 12:41:07 2020 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Feb 05 12:41:07 2020 -0800
tree d41ca3a3bb6950d4fc46626de72e2e1085e359b1
parent 381d0e4d68bc904d468611c558b56e4646182dc7

Camera: don't stop preview on disconnecting device

Test: partner monkey testing
Bug: 147333205
Change-Id: I0a58c10f5372cd5e5420771a5ec8ae5e6ac93169

services/camera/libcameraservice/api1/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 162b50f..ac86563 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -732,6 +732,10 @@
 
     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)