commit d5fdded86912e9c6a3b28034803989656e9a80ad
author Marco Nelissen <marcone@google.com> Wed Oct 23 12:28:31 2013 -0700
committer Marco Nelissen <marcone@google.com> Wed Oct 23 12:28:31 2013 -0700
tree 6c6173f384a0f3ad839c1bcf49d0e08233cb5721
parent 0677854f30ae982df77c2c09d98998c2a7181688
parent d8eb423a1088b53a5a3b31e7e78fb095d8100c9d

resolved conflicts for merge of d8eb423a to klp-dev

Change-Id: I44c7c7d0e1da8fd169a0bf57696e308631fa9f25

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 1cac381..9739893 100755
--- 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);
         }
@@ -4599,7 +4602,7 @@
             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) {