Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev

2015-04-29 22:12:06 +00:00
parent e632dc35d8 192b3d4f90
commit 94d07cb7ef
1 changed files with 2 additions and 1 deletions
--- 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();