summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/providers/media/MediaProvider.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 723e628b..8af0ac48 100755
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -126,11 +126,14 @@ public class MediaProvider extends ContentProvider {
private static final String sExternalPath;
/** Resolved canonical path to cache storage. */
private static final String sCachePath;
+ /** Resolved canonical path to legacy storage. */
+ private static final String sLegacyPath;
static {
try {
sExternalPath = Environment.getExternalStorageDirectory().getCanonicalPath();
sCachePath = Environment.getDownloadCacheDirectory().getCanonicalPath();
+ sLegacyPath = Environment.getLegacyExternalStorageDirectory().getCanonicalPath();
} catch (IOException e) {
throw new RuntimeException("Unable to resolve canonical paths", e);
}
@@ -4613,7 +4616,7 @@ public class MediaProvider extends ContentProvider {
throw new IllegalArgumentException("Unable to resolve canonical path for " + file, e);
}
- if (path.startsWith(sExternalPath)) {
+ if (path.startsWith(sExternalPath) || path.startsWith(sLegacyPath)) {
Context c = getContext();
if (c.checkCallingOrSelfUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
!= PackageManager.PERMISSION_GRANTED) {