commit 5f8d14e07de985f1487c81504669d1a48fa380a8
author Eino-Ville Talvala <etalvala@google.com> Thu May 25 01:58:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 25 01:58:54 2017 +0000
tree 0b7fedf18459c7f278215f0ddabbd9d9a9a6293a
parent eb72e4ff974a9cae36986a442f50174ce4068c28
parent 86d314012e90e8bc16a9bf3da8c4a7dfe3bea50c

Merge "camera.device@3.2 wrapper: Close release fence FDs" into oc-dev am: 1c20927f43
am: 86d314012e

Change-Id: Ic036732ddbd750d47915e3f033d1384499ccea6b

camera/device/3.2/default/CameraDeviceSession.cpp

diff --git a/camera/device/3.2/default/CameraDeviceSession.cpp b/camera/device/3.2/default/CameraDeviceSession.cpp
index 61be82d..bad406f 100644
--- a/camera/device/3.2/default/CameraDeviceSession.cpp
+++ b/camera/device/3.2/default/CameraDeviceSession.cpp
@@ -403,12 +403,14 @@
         if (result.inputBuffer.releaseFence.getNativeHandle() != nullptr) {
             native_handle_t* handle = const_cast<native_handle_t*>(
                     result.inputBuffer.releaseFence.getNativeHandle());
+            native_handle_close(handle);
             native_handle_delete(handle);
         }
         for (auto& buf : result.outputBuffers) {
             if (buf.releaseFence.getNativeHandle() != nullptr) {
                 native_handle_t* handle = const_cast<native_handle_t*>(
                         buf.releaseFence.getNativeHandle());
+                native_handle_close(handle);
                 native_handle_delete(handle);
             }
         }