Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5cfdd9b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I5238d2d4e87d8cd956f2406d0f5acf2d6e28971d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42b3ca51 3e9c1ac8

libs/ui/Gralloc4.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1245,8 +1245,9 @@ status_t Gralloc4Allocator::allocate(std::string requestorName, uint32_t width, 
        } 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]);