Merge "cameraserver: Check for dataspace override during finishConfiguration." (074b3f19) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/Camera3Stream.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -320,7 +320,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;
		}