diff options
| author | Ben Kwa <kenobi@google.com> | 2015-04-29 22:12:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-29 22:12:08 +0000 |
| commit | 94d07cb7efbdd50b72d7f17e7c9596b789ebad4c (patch) | |
| tree | b8a96efcbc33bae48997e9f529da45eb4811c784 /core/java/android/content | |
| parent | e632dc35d8dcad7a09f9abefd5f9fcf2103f3b69 (diff) | |
| parent | 192b3d4f90b0c576a926ea8c93d080606de817b9 (diff) | |
| download | frameworks_base-94d07cb7efbdd50b72d7f17e7c9596b789ebad4c.zip frameworks_base-94d07cb7efbdd50b72d7f17e7c9596b789ebad4c.tar.gz frameworks_base-94d07cb7efbdd50b72d7f17e7c9596b789ebad4c.tar.bz2 | |
Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/ContentProviderNative.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/ContentProviderNative.java b/core/java/android/content/ContentProviderNative.java index f2e7fc4..4769bd0 100644 --- a/core/java/android/content/ContentProviderNative.java +++ b/core/java/android/content/ContentProviderNative.java @@ -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(); |