commit f03cb213d22b238cbd0b72ded36048f0549f921f
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 06 21:59:21 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 06 21:59:21 2019 +0000
tree 45ea557e1d138bca705966a019ed88fc52bc541d
parent c750c131c4dc4ed3aef05d2583e61661d3c38119
parent 5f840f8daa250b832a492fd368741916f777e0b1

Merge "Camera: do not register empty buffer as inflight"

services/camera/libcameraservice/device3/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 2794324..22e09e4 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -4391,8 +4391,11 @@
             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;