commit b2d935c49d6ff1b97dea8690f99a0c379c1a06c8
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Nov 16 10:28:32 2023 -0800
committer Tomasz Wasilczyk <twasilczyk@google.com> Mon Nov 20 11:00:28 2023 -0800
tree 75bafb9ce3158e0c474457f4cb5068aa3184585a
parent 6965d39172401f345ad315a29f263342dd46772a

libshmem: don't depend on unique_fd cast to int

Bug: 302723053
Test: m libshmemcompat
Change-Id: I862e726ca3fa22b1f16a3d718a80d3a035fe129c

media/libshmem/ShmemCompat.cpp

diff --git a/media/libshmem/ShmemCompat.cpp b/media/libshmem/ShmemCompat.cpp
index 246cb24..4200c2e 100644
--- a/media/libshmem/ShmemCompat.cpp
+++ b/media/libshmem/ShmemCompat.cpp
@@ -84,11 +84,11 @@
             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;