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

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

Browse Source 
* commit 'ac151b1e9945599982c6cf871fd82817db7297fb':
  Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile.
This commit is contained in:
Ben Kwa
2015-04-29 22:40:29 +00:00
committed by Android Git Automerger
parent 666dbb43b9 ac151b1e99
commit 0c04cf9aae
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);
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();