commit 6b1e7060986eac6cb8c3412725b741eb750314c9
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Jun 19 20:53:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 19 20:53:29 2019 -0700
tree a1822c5bfeb392b56a34071583b3af1b22ec359f
parent 483d1c9bb54cec6bf4f49725fe05b00a325ce067
parent c6012f0e557383bd3ea2c3534babc1b8baee8b69

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

Change-Id: I79c907454876bdd053bf5f252313468fe594eb2a

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