commit 763972468f5037889aa0b3bbf56c36e7da6660ff
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Jun 19 18:37:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 19 18:37:14 2019 -0700
tree f7b52e1d23dd4d079dba01f1463075da9c5da4b3
parent 2f0cedfad1d8179d7e01a7fb84d67af6ccffa9d0
parent 981693f6ffc24d1df950c8520ce8e68043690ca5

Merge "Camera: fix unknown bufId issue" into qt-dev
am: 981693f6ff

Change-Id: I31718ae56e7ede79798567fc70783156179e6753

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
index 200dd3f..c94c825 100644
--- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
+++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -1233,7 +1233,14 @@
     }
 
     if (mUseHalBufManager) {
-        returnStreamBuffers(results.outputBuffers);
+        // Don't return buffers of bufId 0 (empty buffer)
+        std::vector<StreamBuffer> buffers;
+        for (const auto& sb : results.outputBuffers) {
+            if (sb.bufferId != 0) {
+                buffers.push_back(sb);
+            }
+        }
+        returnStreamBuffers(buffers);
     }
     return notify;
 }