| commit | 28dcd1c4441915e377209e11e4dbc06db30d531e | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Wed Feb 05 12:41:07 2020 -0800 |
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | Wed Apr 01 10:40:10 2020 -0700 |
| tree | 82e9df1fcd5809cb3e80eb1a18473472bca851a1 | |
| parent | 1cfbd0a8a1083af1a7afeb19b2bdc0d757d9daf5 [diff] |
Camera: don't stop preview on disconnecting device Test: partner monkey testing Bug: 147333205 Merged-In: I0a58c10f5372cd5e5420771a5ec8ae5e6ac93169 Change-Id: I0a58c10f5372cd5e5420771a5ec8ae5e6ac93169
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index 1d62a74..ebb0555 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -733,6 +733,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)