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

* commit '36c931b31a15b4ed740c861ec34b7e6573cfd32e': Also consider secondary storage when verifying paths
2014-10-16 00:41:10 +00:00
parent 0cd670b39b 36c931b31a
commit 4683a10f9c
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