Also check legacy path
b/9604671
Change-Id: I49035ed53dab71cdacb7f3cdd59c18e8bb5ba850
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index b68fb6e..f2d9abd 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -126,11 +126,14 @@
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);
}
@@ -4392,7 +4395,7 @@
throw new IllegalArgumentException("Unable to resolve canonical path for " + file, e);
}
- if (path.startsWith(sExternalPath)) {
+ if (path.startsWith(sExternalPath) || path.startsWith(sLegacyPath)) {
getContext().enforceCallingOrSelfPermission(
READ_EXTERNAL_STORAGE, "External path: " + path);