commit 981693f6ffc24d1df950c8520ce8e68043690ca5
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 19 23:03:53 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 19 23:03:53 2019 +0000
tree f7b52e1d23dd4d079dba01f1463075da9c5da4b3
parent be19a50010b9aaedaee85c1930f1db1b5348f778
parent aba88c6cbc3ef052e812ff012f8e220bcadb4119

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

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