diff options
| author | Marco Nelissen <marcone@google.com> | 2014-10-16 00:38:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-16 00:38:03 +0000 |
| commit | 36c931b31a15b4ed740c861ec34b7e6573cfd32e (patch) | |
| tree | 3320a602a47edc7efce43d92bbebe989af933a55 /media/java/android/mtp/MtpDatabase.java | |
| parent | a0b3796d937dff83b5dd94e8f091a36bc9b304dd (diff) | |
| parent | c1fda12823bfac1c2180beddc3f733ea0311b37d (diff) | |
| download | frameworks_base-36c931b31a15b4ed740c861ec34b7e6573cfd32e.zip frameworks_base-36c931b31a15b4ed740c861ec34b7e6573cfd32e.tar.gz frameworks_base-36c931b31a15b4ed740c861ec34b7e6573cfd32e.tar.bz2 | |
Merge "Also consider secondary storage when verifying paths" into lmp-dev
Diffstat (limited to 'media/java/android/mtp/MtpDatabase.java')
| -rwxr-xr-x | media/java/android/mtp/MtpDatabase.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java index 1921f47..13cdc69 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 |