commit aa25946094ac50191e353ac3767e861c7b265132
author Jayant Chowdhary <jchowdhary@google.com> Mon Mar 18 13:41:29 2019 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Thu Mar 21 11:18:47 2019 -0700
tree 907393d9a958674648f89924a6746801a9faa3ac
parent 5ee05596015a14d01212ad73c085f0558bb3c863

cameraserver: Check for dataspace override during finishConfiguration.

Bug: 120407707

Test: CTS
Test: Use camera to take pictures / record videos (sanity)

Merged-In: I7b29c337d0e217d2eb6a62e2c75ccc550d795e61
Change-Id: I7b29c337d0e217d2eb6a62e2c75ccc550d795e61
(cherry picked from commit 7d355db285c285d212908e08756c5ca7739b7ad3)
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

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;
     }