commit 411ddcc42a17abf4173345a992e4cd6575751739
author Eino-Ville Talvala <etalvala@google.com> Wed Oct 10 17:17:01 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Wed Oct 10 17:18:38 2012 -0700
tree 5ce68ec65af9f9bc1a92c150cb28d40a698b13dd
parent 32dd792aa1675e91c7a0cf7cee7aba215fe1be67

Camera2: Don't error out of startPreview when already recording.

Bug: 7327474
Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53

services/camera/libcameraservice/Camera2Client.cpp

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 @@
 
     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) {