Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2d77ed7 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

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

* commit '4683a10f':
  Also consider secondary storage when verifying paths
parents 7e4a3aec 4683a10f

media/java/android/mtp/MtpDatabase.java

+4 −2
Original line number Diff line number Diff line
@@ -306,9 +306,11 @@ public class MtpDatabase { 
        try {

            File f = new File(path);

            String canonical = f.getCanonicalPath();

            if (canonical.startsWith(mMediaStoragePath)) {

            for (String root: mStorageMap.keySet()) {

                if (canonical.startsWith(root)) {

                    return true;

                }

            }

        } catch (IOException e) {

            // ignore

        }