Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Kwa
2015-04-29 22:12:06 +00:00
committed by Android (Google) Code Review
parent e632dc35d8 192b3d4f90
commit 94d07cb7ef
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/ContentProviderNative.java
View File

@@ -593,7 +593,8 @@ final class ContentProviderProxy implements IContentProvider
DatabaseUtils.readExceptionWithFileNotFoundExceptionFromParcel(reply); DatabaseUtils.readExceptionWithFileNotFoundExceptionFromParcel(reply);
int has = reply.readInt(); int has = reply.readInt();
ParcelFileDescriptor fd = has != 0 ? reply.readFileDescriptor() : null; ParcelFileDescriptor fd = has != 0 ? ParcelFileDescriptor.CREATOR
.createFromParcel(reply) : null;
return fd; return fd;
} finally { } finally {
data.recycle(); data.recycle();