Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid unnecessary dup

Browse Source 
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
(cherry picked from commit 78c2f631d8)
This commit is contained in:
Ytai Ben-Tsvi
2021-10-08 17:55:14 -07:00
committed by Ytai Ben-tsvi
parent 6f26ef6d74
commit 7c55b4337c
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/soundtrigger_middleware/ConversionUtil.java
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);
}