commit 58b1b4ec8d71ef86afde643832dcfdbf4bbe4bda
author Yin-Chia Yeh <yinchiayeh@google.com> Mon Oct 15 12:18:36 2018 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Mon Nov 12 10:50:13 2018 -0800
tree 9620815e54b1e6822a8b2620825a6482bc0612d0
parent 30ab5ed62fecb96078fb8ece767a66ef794bcb12

Camera: handle HAL buffer manager + stream sharing case

Test: CTS MultiViewTest
Bug: 109829698
Change-Id: I98a7438d6bb9c01f95ae69c7556d7ed965629410

services/camera/libcameraservice/device3/Camera3DummyStream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3DummyStream.cpp b/services/camera/libcameraservice/device3/Camera3DummyStream.cpp
index fb1ff77..b637160 100644
--- a/services/camera/libcameraservice/device3/Camera3DummyStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3DummyStream.cpp
@@ -48,7 +48,7 @@
 
 status_t Camera3DummyStream::returnBufferLocked(
         const camera3_stream_buffer &,
-        nsecs_t) {
+        nsecs_t, const std::vector<size_t>&) {
     ATRACE_CALL();
     ALOGE("%s: Stream %d: Dummy stream cannot return buffers!", __FUNCTION__, mId);
     return INVALID_OPERATION;
@@ -58,6 +58,7 @@
             const camera3_stream_buffer &,
             nsecs_t,
             bool,
+            const std::vector<size_t>&,
             /*out*/
             sp<Fence>*) {
     ATRACE_CALL();