From 28dcd1c4441915e377209e11e4dbc06db30d531e Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Wed, 5 Feb 2020 12:41:07 -0800
Subject: [PATCH] Camera: don't stop preview on disconnecting device

Test: partner monkey testing
Bug: 147333205
Merged-In: I0a58c10f5372cd5e5420771a5ec8ae5e6ac93169
Change-Id: I0a58c10f5372cd5e5420771a5ec8ae5e6ac93169
---
 services/camera/libcameraservice/api1/Camera2Client.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 1d62a74883..ebb055584a 100644
--- 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)