Merge "Avoid unnecessary dup"

This commit is contained in:
Ytai Ben-tsvi
2021-10-25 20:48:37 +00:00
committed by Gerrit Code Review

View File

@@ -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);
}