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

Commit 94d07cb7 authored by Ben Kwa's avatar Ben Kwa Committed by Android (Google) Code Review
Browse files

Merge "Properly unparcel the PFDs passed to... 

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

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();