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

Commit 102271f7 authored by Ytai Ben-tsvi's avatar Ytai Ben-tsvi Committed by Android (Google) Code Review
Browse files

Merge "Avoid unnecessary dup" into sc-v2-dev

parents 22314d89 7c55b433
Loading
Loading
Loading
Loading
+1 −9
Original line number Diff line number Diff line
@@ -429,15 +429,7 @@ class ConversionUtil {
    private static @NonNull
    HidlMemory parcelFileDescriptorToHidlMemory(@Nullable ParcelFileDescriptor data, int dataSize) {
        if (dataSize > 0) {
            // Extract a dup of the underlying FileDescriptor out of data.
            FileDescriptor fd = new FileDescriptor();
            try {
                ParcelFileDescriptor dup = data.dup();
                fd.setInt$(dup.detachFd());
                return HidlMemoryUtil.fileDescriptorToHidlMemory(fd, dataSize);
            } catch (IOException e) {
                throw new RuntimeException(e);
            }
            return HidlMemoryUtil.fileDescriptorToHidlMemory(data.getFileDescriptor(), dataSize);
        } else {
            return HidlMemoryUtil.fileDescriptorToHidlMemory(null, 0);
        }