diff options
author | Marco Nelissen <marcone@google.com> | 2013-10-23 13:47:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-23 13:47:42 -0700 |
commit | 221c0fe1c2ca07c62ef37954774a9f1817d2cfa5 (patch) | |
tree | 942db4f19fed58371e68c1206ca3db4ec9c47b0a | |
parent | 4aac7ec807d122b9bfa004524612dd40af451d7f (diff) | |
parent | 1a74cc6de99d93234c4daf2c56d9ffd39be25c58 (diff) | |
download | android_packages_providers_MediaProvider-221c0fe1c2ca07c62ef37954774a9f1817d2cfa5.tar.gz android_packages_providers_MediaProvider-221c0fe1c2ca07c62ef37954774a9f1817d2cfa5.tar.bz2 android_packages_providers_MediaProvider-221c0fe1c2ca07c62ef37954774a9f1817d2cfa5.zip |
am 1a74cc6d: am d5fdded8: resolved conflicts for merge of d8eb423a to klp-dev
* commit '1a74cc6de99d93234c4daf2c56d9ffd39be25c58':
Also check legacy path
-rwxr-xr-x | src/com/android/providers/media/MediaProvider.java | 5 |
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) { |