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

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

Merge "Parcel: Avoid NPE in finalization" 

am: b085deec

Change-Id: I646baf55627a3874a10775846458af5f1dcd5d8c
parents 812b09d6 b085deec

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);