diff options
author | Marco Nelissen <marcone@google.com> | 2013-10-09 19:57:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 19:57:33 -0700 |
commit | 81df095d28df9f1609fb9407262e0e1c3f733231 (patch) | |
tree | 1b090f1869d90b36cc6fb5569dd6b55571804bea | |
parent | 67785e0398fa1267d7e2c76d1a709878344c70f5 (diff) | |
parent | e9a60faf42d67647812a127ebad18b61ad774f87 (diff) | |
download | MediaProvider-81df095d28df9f1609fb9407262e0e1c3f733231.tar.gz |
am e9a60faf: am e9052856: am 1cb04c3a: am b75caaed: am 28680dd8: am 39955731: am dc906ab2: Fix access to secondary storage
* commit 'e9a60faf42d67647812a127ebad18b61ad774f87':
Fix access to secondary storage
-rwxr-xr-x | src/com/android/providers/media/MediaProvider.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index 0265a1e85..bf76bbff9 100755 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -4468,6 +4468,10 @@ public class MediaProvider extends ContentProvider { } else if (isWrite) { // don't write to non-cache, non-sdcard files. throw new FileNotFoundException("Can't access " + file); + } else if (isSecondaryExternalPath(path)) { + // read access is OK with the appropriate permission + getContext().enforceCallingOrSelfPermission( + READ_EXTERNAL_STORAGE, "External path: " + path); } else { checkWorldReadAccess(path); } @@ -4475,6 +4479,15 @@ public class MediaProvider extends ContentProvider { return ParcelFileDescriptor.open(file, modeBits); } + private boolean isSecondaryExternalPath(String path) { + for (int i = mExternalStoragePaths.length - 1; i >= 0; --i) { + if (path.startsWith(mExternalStoragePaths[i])) { + return true; + } + } + return false; + } + /** * Check whether the path is a world-readable file */ |