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

Merge "Avoid unnecessary dup" into sc-v2-dev am: 102271f702

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16041471

Change-Id: I6443b46a5fd69baa0db18e2d70b615ebc259e055
This commit is contained in:
Ytai Ben-tsvi
2021-10-18 20:30:17 +00:00
committed by Automerger Merge Worker
parent ac0da15643 102271f702
commit 884b6dde4e
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 private static @NonNull
HidlMemory parcelFileDescriptorToHidlMemory(@Nullable ParcelFileDescriptor data, int dataSize) { HidlMemory parcelFileDescriptorToHidlMemory(@Nullable ParcelFileDescriptor data, int dataSize) {
if (dataSize > 0) { if (dataSize > 0) {
// Extract a dup of the underlying FileDescriptor out of data. return HidlMemoryUtil.fileDescriptorToHidlMemory(data.getFileDescriptor(), dataSize);
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);
}
} else { } else {
return HidlMemoryUtil.fileDescriptorToHidlMemory(null, 0); return HidlMemoryUtil.fileDescriptorToHidlMemory(null, 0);
} }