commit c5cfdd9bee4c64a7f56d560886d83cfd1a2f30c3
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 27 21:18:28 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 27 21:18:28 2022 +0000
tree 4775cd0332383b8abec241040ae287f2391bf069
parent 42b3ca514f59aca9c11ecad3450e21edd9636dc2
parent 3e9c1ac8799c93da8fa417ace2b4abb6c32953b4

Merge "Close native handle properly." into tm-dev am: 3e9c1ac879

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17917764

Change-Id: I5238d2d4e87d8cd956f2406d0f5acf2d6e28971d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/ui/Gralloc4.cpp

diff --git a/libs/ui/Gralloc4.cpp b/libs/ui/Gralloc4.cpp
index 4f950b8..f6ab7b2 100644
--- a/libs/ui/Gralloc4.cpp
+++ b/libs/ui/Gralloc4.cpp
@@ -1245,8 +1245,9 @@
         } else {
             if (importBuffers) {
                 for (uint32_t i = 0; i < bufferCount; i++) {
-                    error = mMapper.importBuffer(makeFromAidl(result.buffers[i]),
-                                                 &outBufferHandles[i]);
+                    auto handle = makeFromAidl(result.buffers[i]);
+                    error = mMapper.importBuffer(handle, &outBufferHandles[i]);
+                    native_handle_delete(handle);
                     if (error != NO_ERROR) {
                         for (uint32_t j = 0; j < i; j++) {
                             mMapper.freeBuffer(outBufferHandles[j]);