commit 7d355db285c285d212908e08756c5ca7739b7ad3
author Jayant Chowdhary <jchowdhary@google.com> Mon Mar 18 13:41:29 2019 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Wed Mar 20 16:13:26 2019 -0700
tree 013b946bc02bf9a4b767af1959344e48a138f8fa
parent f97d64cd3a1588b22b47dd3805be291525bb17d9

cameraserver: Check for dataspace override during finishConfiguration.

Bug: 120407707

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

Change-Id: I7b29c337d0e217d2eb6a62e2c75ccc550d795e61
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 0571741..12ff130 100644
--- a/services/camera/libcameraservice/device3/Camera3Stream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@@ -321,7 +321,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;
     }