From 78c2f631d839b87185cc8dd74558aea4596de571 Mon Sep 17 00:00:00 2001
From: Ytai Ben-Tsvi <ytai@google.com>
Date: Fri, 8 Oct 2021 17:55:14 -0700
Subject: [PATCH] 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
---
 .../server/soundtrigger_middleware/ConversionUtil.java | 10 +---------
 1 file changed, 1 insertion(+), 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 47bd72a899b91..9ac7e3bd79c18 100644
--- a/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java
+++ b/services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java
@@ -441,15 +441,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);
         }