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

Commit 02f9bddf authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by android-build-merger
Browse files

Merge "cameraserver: Check for dataspace override during finishConfiguration." 

am: 074b3f19

Change-Id: Ia65f5ab82221f331a2963422244193b525f507d5
parents b5444262 074b3f19

services/camera/libcameraservice/device3/Camera3Stream.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ status_t Camera3Stream::finishConfiguration() { 
    // so. As documented in hardware/camera3.h:configure_streams().

    // so. As documented in hardware/camera3.h:configure_streams().

    if (mState == STATE_IN_RECONFIG &&

    if (mState == STATE_IN_RECONFIG &&

            mOldUsage == mUsage &&

            mOldUsage == mUsage &&

            mOldMaxBuffers == camera3_stream::max_buffers) {

            mOldMaxBuffers == camera3_stream::max_buffers && !mDataSpaceOverridden) {

        mState = STATE_CONFIGURED;

        mState = STATE_CONFIGURED;

        return OK;

        return OK;

    }

    }