commit 074b3f190d9f5b2796e222161282ffd664258b54
author Jayant Chowdhary <jchowdhary@google.com> Thu Mar 21 21:02:49 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 21 21:02:49 2019 +0000
tree 60c2be4d4574394a2081300ecac2a9ce41ad0567
parent 969975c53fbf5a78304fa7eb4107629c0a353509
parent aa25946094ac50191e353ac3767e861c7b265132

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

services/camera/libcameraservice/device3/Camera3Stream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp
index 7ebc299..a1b0757 100644
--- a/services/camera/libcameraservice/device3/Camera3Stream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@@ -320,7 +320,7 @@
     // 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;
     }