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

Commit 0c04cf9a authored by Ben Kwa's avatar Ben Kwa Committed by Android Git Automerger
Browse files

am ac151b1e: am 94d07cb7: Merge "Properly unparcel the PFDs passed to... 

am ac151b1e: am 94d07cb7: Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev

* commit 'ac151b1e':
  Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile.
parents 666dbb43 ac151b1e

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