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

Commit 3264d7d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libshmem: don't depend on unique_fd cast to int" into main am:... 

Merge "libshmem: don't depend on unique_fd cast to int" into main am: 0161347a am: 5b0104b0 am: ac0d8d35

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2834954



Change-Id: I4b7fb23a89878cf9852fe0c8bc22c34b70ab602f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d714b84f ac0d8d35

media/libshmem/ShmemCompat.cpp

+3 −3
Original line number Diff line number Diff line
@@ -84,11 +84,11 @@ bool convertIMemoryToSharedFileRegion(const sp<IMemory>& mem, 
            return false;

        }



        const int fd = fcntl(heap->getHeapID(), F_DUPFD_CLOEXEC, 0);

        if (fd < 0) {

        base::unique_fd fd(fcntl(heap->getHeapID(), F_DUPFD_CLOEXEC, 0));

        if (!fd.ok()) {

            return false;

        }

        result->fd.reset(base::unique_fd(fd));

        result->fd.reset(std::move(fd));

        result->size = size;

        result->offset = heap->getOffset() + offset;

        result->writeable = (heap->getFlags() & IMemoryHeap::READ_ONLY) == 0;