Merge "Parcel: Avoid NPE in finalization" am: b085deece9 am: cb34bdf55c

am: 7934a7f828 Change-Id: I5c2819892170855c4d009261785f9e8d26f9ad5e
2017-10-10 18:01:22 +00:00
parent 7da56440e6 7934a7f828
commit 77de886b55
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/os/ParcelFileDescriptor.java
+++ b/core/java/android/os/ParcelFileDescriptor.java
@@ -737,7 +737,9 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
    private void closeWithStatus(int status, String msg) {
        if (mClosed) return;
        mClosed = true;
-        mGuard.close();
+        if (mGuard != null) {
+            mGuard.close();
+        }
        // Status MUST be sent before closing actual descriptor
        writeCommStatusAndClose(status, msg);
        IoUtils.closeQuietly(mFd);