Also consider secondary storage when verifying paths

Bug: 17673184 Bug: 17982103 Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
2014-10-15 14:32:22 -07:00
parent d700e5a37a
commit c1fda12823
1 changed files with 4 additions and 2 deletions
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -306,8 +306,10 @@ public class MtpDatabase {
        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