commit 86d314012e90e8bc16a9bf3da8c4a7dfe3bea50c
author Eino-Ville Talvala <etalvala@google.com> Thu May 25 01:55:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 25 01:55:55 2017 +0000
tree 1bd2ee6533f778a61c42bb8ab168108f32b868ae
parent 1c231dfdad140021c9a80b8ab5f5f8b4682c815b
parent 1c20927f43dc6262e3a6235ce47c21ca096e2ae7

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

Change-Id: I81840052731f509509cde33ba773b5972ed08d66

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);
             }
         }