commit 71d6454cc20b7a3bbe0cfd375c778c5fcc54795a
author Alex Ray <aray@google.com> Wed Sep 26 15:52:50 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 26 23:32:26 2012 -0700
tree 938076b1d9616b2df878bd085db46fb486857043
parent 2a81a1519382e658941fdabe73a94a64d0b6f115

Camera2: Re-entering preview state on v2 Device

Bug: 7240891
Change-Id: I6a01b27197b4ee89a68f06f4375d315a716b67ae

services/camera/libcameraservice/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index a83977f..d315abb 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -624,7 +624,13 @@
 status_t Camera2Client::startPreviewL(Parameters &params, bool restart) {
     ATRACE_CALL();
     status_t res;
-    if (params.state >= Parameters::PREVIEW && !restart) {
+    if (params.state == Parameters::PREVIEW && !restart) {
+        // Succeed attempt to re-enter preview state
+        ALOGI("%s: Not starting preview; already in preview state.",
+              __FUNCTION__);
+        return OK;
+    }
+    if (params.state > Parameters::PREVIEW && !restart) {
         ALOGE("%s: Can't start preview in state %s",
                 __FUNCTION__,
                 Parameters::getStateName(params.state));