commit 09f02e55ec4227a29662e7f6ab07fe7d09d9eba0
author Chien-Yu Chen <cychen@google.com> Wed Apr 15 23:26:04 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 15 23:26:05 2015 +0000
tree 04badaa41ad21dd4a45df377ba1248333136c178
parent 554a277d4e42a3d3df3d90ba0e7dfa2d31690e32
parent 90746f4203989fceb0f2131163435644040218d3

Merge "Camera3: allow reconfiguring the input stream"

services/camera/libcameraservice/device3/Camera3Stream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp
index 3821da1..4c40bb6 100644
--- a/services/camera/libcameraservice/device3/Camera3Stream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@@ -109,11 +109,7 @@
             // oldUsage/oldMaxBuffers
             return this;
         case STATE_CONFIGURED:
-            if (stream_type == CAMERA3_STREAM_INPUT) {
-                ALOGE("%s: Cannot configure an input stream twice",
-                        __FUNCTION__);
-                return NULL;
-            } else if (hasOutstandingBuffersLocked()) {
+            if (hasOutstandingBuffersLocked()) {
                 ALOGE("%s: Cannot configure stream; has outstanding buffers",
                         __FUNCTION__);
                 return NULL;