From b30ad6f5e825989f92abc26cf86edb0c6b13fb01 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Thu, 11 Jun 2015 12:34:22 -0700
Subject: [PATCH] Fix the PFD detachFd issue.

Bug 18566244

Change-Id: I410b2219e08c9108236e2c2926bd613315198703
---
 core/java/android/os/ParcelFileDescriptor.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/os/ParcelFileDescriptor.java b/core/java/android/os/ParcelFileDescriptor.java
index 1c9c71336bddb..135f369f895f5 100644
--- a/core/java/android/os/ParcelFileDescriptor.java
+++ b/core/java/android/os/ParcelFileDescriptor.java
@@ -621,6 +621,9 @@ public class ParcelFileDescriptor implements Parcelable, Closeable {
             final int fd = getFd();
             Parcel.clearFileDescriptor(mFd);
             writeCommStatusAndClose(Status.DETACHED, null);
+            mClosed = true;
+            mGuard.close();
+            releaseResources();
             return fd;
         }
     }