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

5 years ago · 28404e281d
parent 9000d69891 7d355db285
commit 28404e281d
1 changed files with 1 additions and 1 deletions
--- a/services/camera/libcameraservice/device3/Camera3Stream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@ -321,7 +321,7 @@ status_t Camera3Stream::finishConfiguration() {
    // so. As documented in hardware/camera3.h:configure_streams().
    if (mState == STATE_IN_RECONFIG &&
            mOldUsage == mUsage &&
-            mOldMaxBuffers == camera3_stream::max_buffers) {
+            mOldMaxBuffers == camera3_stream::max_buffers && !mDataSpaceOverridden) {
        mState = STATE_CONFIGURED;
        return OK;
    }