From a14be59340219c47639ec77a352d2af362551a6f Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Wed, 10 Oct 2012 17:17:01 -0700 Subject: Camera2: Don't error out of startPreview when already recording. Bug: 7327474 Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53 --- services/camera/libcameraservice/Camera2Client.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'services') diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 0ab4e8c..7290663 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -611,10 +611,13 @@ status_t Camera2Client::startPreviewL(Parameters ¶ms, bool restart) { ALOGV("%s: state == %d, restart = %d", __FUNCTION__, params.state, restart); - if (params.state == Parameters::PREVIEW && !restart) { - // Succeed attempt to re-enter preview state - ALOGI("%s: Not starting preview; already in preview state.", - __FUNCTION__); + if ( (params.state == Parameters::PREVIEW || + params.state == Parameters::RECORD || + params.state == Parameters::VIDEO_SNAPSHOT) + && !restart) { + // Succeed attempt to re-enter a streaming state + ALOGI("%s: Camera %d: Preview already active, ignoring restart", + __FUNCTION__, mCameraId); return OK; } if (params.state > Parameters::PREVIEW && !restart) { -- cgit v1.1