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

Merge "MemoryIntArray: dup in writeToParcel." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-20 21:31:13 +00:00
committed by Android (Google) Code Review
parent 25443162c3 536cf5e016
commit 6429b70cf6
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/util/MemoryIntArray.java
View File

@@ -175,12 +175,10 @@ public final class MemoryIntArray implements Parcelable, Closeable {
@Override
public void writeToParcel(Parcel parcel, int flags) {
ParcelFileDescriptor pfd = ParcelFileDescriptor.adoptFd(mFd);
try {
// Don't let writing to a parcel to close our fd - plz
parcel.writeParcelable(pfd, flags & ~Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
} finally {
pfd.detachFd();
try (ParcelFileDescriptor pfd = ParcelFileDescriptor.fromFd(mFd)) {
parcel.writeParcelable(pfd, flags);
} catch (IOException ex) {
throw new RuntimeException(ex);
}
}