summaryrefslogtreecommitdiffstats
path: root/packages/ExternalStorageProvider
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2013-09-20 16:05:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-20 16:05:21 -0700
commit5fc67f98b92ac1542eda7739ea9604cf69e18dc5 (patch)
tree1102f449f24a649e7146095510a2f1c354ac7d83 /packages/ExternalStorageProvider
parentf439bcd953f34a1e5784ddc74d4fd093939ace85 (diff)
parenta35ff66127d07117e93268482d7e9719abfd58c3 (diff)
downloadframeworks_base-5fc67f98b92ac1542eda7739ea9604cf69e18dc5.zip
frameworks_base-5fc67f98b92ac1542eda7739ea9604cf69e18dc5.tar.gz
frameworks_base-5fc67f98b92ac1542eda7739ea9604cf69e18dc5.tar.bz2
am a35ff661: am d473ebb7: Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev
* commit 'a35ff66127d07117e93268482d7e9719abfd58c3': Surfaces ParcelFileDescriptor#parseMode() as API
Diffstat (limited to 'packages/ExternalStorageProvider')
-rw-r--r--packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 3e2cd15..f468abc 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -310,7 +310,7 @@ public class ExternalStorageProvider extends DocumentsProvider {
String documentId, String mode, CancellationSignal signal)
throws FileNotFoundException {
final File file = getFileForDocId(documentId);
- return ParcelFileDescriptor.open(file, ContentResolver.modeToMode(null, mode));
+ return ParcelFileDescriptor.open(file, ParcelFileDescriptor.parseMode(mode));
}
@Override