From c1fda12823bfac1c2180beddc3f733ea0311b37d Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Wed, 15 Oct 2014 14:32:22 -0700
Subject: [PATCH] Also consider secondary storage when verifying paths

Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
---
 media/java/android/mtp/MtpDatabase.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java
index 1921f47bd8418..13cdc693d0b46 100755
--- 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