commit c1fda12823bfac1c2180beddc3f733ea0311b37d
author Marco Nelissen <marcone@google.com> Wed Oct 15 14:32:22 2014 -0700
committer Marco Nelissen <marcone@google.com> Wed Oct 15 15:36:50 2014 -0700
tree 013cc4332c48a47e506d9978bfbf179e8015521f
parent d700e5a37afec6c264609c5df4c3a6b783417330

Also consider secondary storage when verifying paths

Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d

media/java/android/mtp/MtpDatabase.java

diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java
index 1921f47..13cdc69 100755
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -306,8 +306,10 @@
         try {
             File f = new File(path);
             String canonical = f.getCanonicalPath();
-            if (canonical.startsWith(mMediaStoragePath)) {
-                return true;
+            for (String root: mStorageMap.keySet()) {
+                if (canonical.startsWith(root)) {
+                    return true;
+                }
             }
         } catch (IOException e) {
             // ignore