From 5f840f8daa250b832a492fd368741916f777e0b1 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Tue, 5 Mar 2019 11:59:04 -0800
Subject: [PATCH] Camera: do not register empty buffer as inflight

Test: no more wrong log print during disconnect
Bug: 120986771
Change-Id: I7926f12ba5d234ddb02ac9e5fddfb8c23df4ddb6
---
 services/camera/libcameraservice/device3/Camera3Device.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index bc76ada8d9..7223b8d71b 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -4384,8 +4384,11 @@ status_t Camera3Device::HalInterface::wrapAsHidlRequest(camera3_capture_request_
             dst.status = BufferStatus::OK;
             dst.releaseFence = nullptr;
 
-            pushInflightBufferLocked(captureRequest->frameNumber, streamId,
-                    src->buffer, src->acquire_fence);
+            // Output buffers are empty when using HAL buffer manager
+            if (!mUseHalBufManager) {
+                pushInflightBufferLocked(captureRequest->frameNumber, streamId,
+                        src->buffer, src->acquire_fence);
+            }
         }
     }
     return OK;