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

Merge "Fix regression in PFD#fromData" into qt-r1-dev

Browse Source
This commit is contained in:
John Reck
2019-07-29 21:23:57 +00:00
committed by Android (Google) Code Review
parent 9693956247 12ea937f8f
commit 1775a48935
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/ParcelFileDescriptor.java
View File

@@ -581,12 +581,16 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
public static ParcelFileDescriptor fromData(byte[] data, String name) throws IOException { public static ParcelFileDescriptor fromData(byte[] data, String name) throws IOException {
if (data == null) return null; if (data == null) return null;
MemoryFile file = new MemoryFile(name, data.length); MemoryFile file = new MemoryFile(name, data.length);
try {
if (data.length > 0) { if (data.length > 0) {
file.writeBytes(data, 0, 0, data.length); file.writeBytes(data, 0, 0, data.length);
} }
file.deactivate(); file.deactivate();
FileDescriptor fd = file.getFileDescriptor(); FileDescriptor fd = file.getFileDescriptor();
return fd != null ? ParcelFileDescriptor.dup(fd) : null; return fd != null ? ParcelFileDescriptor.dup(fd) : null;
} finally {
file.close();
}
} }
/** /**