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

Commit 28404e28 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

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

parents 9000d698 7d355db2

services/camera/libcameraservice/device3/Camera3Stream.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -321,7 +321,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;

    }

    }