From 192b3d4f90b0c576a926ea8c93d080606de817b9 Mon Sep 17 00:00:00 2001
From: Ben Kwa <kenobi@google.com>
Date: Wed, 29 Apr 2015 13:28:25 -0700
Subject: [PATCH] Properly unparcel the PFDs passed to
 android.content.ContentProviderProxy.openFile.

BUG=20693984

Change-Id: Id089d218057d5439da1bd5bf0ce3991059c1ecad
---
 core/java/android/content/ContentProviderNative.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/ContentProviderNative.java b/core/java/android/content/ContentProviderNative.java
index f2e7fc463ab6f..4769bd02a5dc5 100644
--- a/core/java/android/content/ContentProviderNative.java
+++ b/core/java/android/content/ContentProviderNative.java
@@ -593,7 +593,8 @@ final class ContentProviderProxy implements IContentProvider
 
             DatabaseUtils.readExceptionWithFileNotFoundExceptionFromParcel(reply);
             int has = reply.readInt();
-            ParcelFileDescriptor fd = has != 0 ? reply.readFileDescriptor() : null;
+            ParcelFileDescriptor fd = has != 0 ? ParcelFileDescriptor.CREATOR
+                    .createFromParcel(reply) : null;
             return fd;
         } finally {
             data.recycle();