diff options
| author | 2021-10-08 17:55:14 -0700 | |
|---|---|---|
| committer | 2021-10-25 17:52:04 +0000 | |
| commit | 0b7ec941efa39f0832c25d1655eef590d6b3121f (patch) | |
| tree | 6c0308f9ca7ea3d4e20a81e12ecf8085167a5b61 | |
| parent | 3d4a7e57fe975854684574fa2a0e71d77e3bb97d (diff) | |
Avoid unnecessary dup
fileDescriptorToHidlMemory() does not take ownership of the
FileDescriptor, so no need to dup it.
Test: Manual verification of soundtrigger use-cases
Bug: 202424221
Change-Id: I43ab5c25f5b3abdec236c0a78a03a197ad2d0da2
Merged-In: I43ab5c25f5b3abdec236c0a78a03a197ad2d0da2
| -rw-r--r-- | services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java b/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java index 6366280e1762..7ffff935128f 100644 --- a/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java +++ b/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java @@ -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); } |