am d3a62f1b: am a2d77ed7: am 4683a10f: am 36c931b3: Merge "Also consider secondary storage when verifying paths" into lmp-dev

* commit 'd3a62f1b6e9993d3a4a5f477ae541686e6b57ef4': Also consider secondary storage when verifying paths
2014-10-16 18:05:03 +00:00
parent e51d313ce8 d3a62f1b6e
commit 95b9d04d74
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