Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09f02e55 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android (Google) Code Review
Browse files

Merge "Camera3: allow reconfiguring the input stream"

parents 554a277d 90746f42

services/camera/libcameraservice/device3/Camera3Stream.cpp

+1 −5
Original line number Diff line number Diff line
@@ -109,11 +109,7 @@ camera3_stream* Camera3Stream::startConfiguration() { 
            // 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;