commit b4a53aa48f88fb5fe499b4602b9b25d325ba52ec
author Marco Nelissen <marcone@google.com> Wed Oct 23 11:52:54 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 23 11:52:54 2013 -0700
tree 7043d36706219029908d29b2c617672fe1e1a315
parent b75caaed46e895f4f9f1d545789dca0c199fa209
parent 5943bf87fe6511fa688cb29ccef87ace5ccda522

am 5943bf87: Also check legacy path

* commit '5943bf87fe6511fa688cb29ccef87ace5ccda522':
  Also check legacy path

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 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);