Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '36c931b31a15b4ed740c861ec34b7e6573cfd32e':
  Also consider secondary storage when verifying paths
This commit is contained in:
Marco Nelissen
2014-10-16 00:41:10 +00:00
committed by Android Git Automerger
parent 0cd670b39b 36c931b31a
commit 4683a10f9c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/mtp/MtpDatabase.java
View File

@@ -306,9 +306,11 @@ public class MtpDatabase {
try { try {
File f = new File(path); File f = new File(path);
String canonical = f.getCanonicalPath(); String canonical = f.getCanonicalPath();
if (canonical.startsWith(mMediaStoragePath)) { for (String root: mStorageMap.keySet()) {
if (canonical.startsWith(root)) {
return true; return true;
} }
}
} catch (IOException e) { } catch (IOException e) {
// ignore // ignore
} }