commit 04df63b07ff95641d715de942dc5aebb4757232e
author Jayant Chowdhary <jchowdhary@google.com> Thu Mar 24 20:04:24 2022 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> Thu Mar 24 20:04:24 2022 +0000
tree bec89818b3043ecbde17c9b8b5c7716c0576e40d
parent a64569c3db8827703004e2ff0371a4dad88fcc33
parent 213a65c6fd4fe146fab0e7f27f7b2f0e9b33e408

[automerge] cameraserver: Fix convertToHidl for requestStreamBuffers return. 2p: 213a65c6fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17385331

Bug: 225053638
Change-Id: Ic9958b32757d019726e7d3a99289eedb9f832427

services/camera/libcameraservice/device3/hidl/HidlCamera3OutputUtils.cpp

diff --git a/services/camera/libcameraservice/device3/hidl/HidlCamera3OutputUtils.cpp b/services/camera/libcameraservice/device3/hidl/HidlCamera3OutputUtils.cpp
index 1563dcf..60e4e42 100644
--- a/services/camera/libcameraservice/device3/hidl/HidlCamera3OutputUtils.cpp
+++ b/services/camera/libcameraservice/device3/hidl/HidlCamera3OutputUtils.cpp
@@ -219,6 +219,7 @@
         tmpBuffers[i].buffer = convertToHidl(aBuf.buffer, handlesCreated);
         tmpBuffers[i].acquireFence = convertToHidl(aBuf.acquireFence, handlesCreated);
         tmpBuffers[i].releaseFence = convertToHidl(aBuf.releaseFence, handlesCreated);
+        i++;
     }
     hBuffersVal.buffers(std::move(tmpBuffers));
 }