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

Commit 192b3d4f authored by Ben Kwa's avatar Ben Kwa
Browse files

Properly unparcel the PFDs passed to 

android.content.ContentProviderProxy.openFile.

BUG=20693984

Change-Id: Id089d218057d5439da1bd5bf0ce3991059c1ecad
parent 5d3249d6

core/java/android/content/ContentProviderNative.java

+2 −1
Original line number Diff line number Diff line
@@ -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();