Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7934a7f8 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Parcel: Avoid NPE in finalization" am: b085deec 

am: cb34bdf5

Change-Id: Idd444cd9dfe78d4200f67a4fe6b3c4fb13767f29
parents 7f492763 cb34bdf5

core/java/android/os/ParcelFileDescriptor.java

+3 −1
Original line number Diff line number Diff line
@@ -737,7 +737,9 @@ public class ParcelFileDescriptor implements Parcelable, Closeable { 
    private void closeWithStatus(int status, String msg) {

        if (mClosed) return;

        mClosed = true;

        if (mGuard != null) {

            mGuard.close();

        }

        // Status MUST be sent before closing actual descriptor

        writeCommStatusAndClose(status, msg);

        IoUtils.closeQuietly(mFd);