Merge "Also consider secondary storage when verifying paths" into lmp-dev

2014-10-16 00:38:01 +00:00
parent a0b3796d93 c1fda12823
commit 36c931b31a
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