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

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

am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath()... 

am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"

# By Jan Bjernler
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'b683f354':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
parents 93194ffb b683f354

core/java/android/provider/MediaStore.java

+18 −0
Original line number Diff line number Diff line
@@ -1324,6 +1324,18 @@ public final class MediaStore { 
        }



        public static final class Media implements AudioColumns {



            private static final String[] EXTERNAL_PATHS;



            static {

                String secondary_storage = System.getenv("SECONDARY_STORAGE");

                if (secondary_storage != null) {

                    EXTERNAL_PATHS = secondary_storage.split(":");

                } else {

                    EXTERNAL_PATHS = new String[0];

                }

            }



            /**

             * Get the content:// style URI for the audio media table on the

             * given volume.
@@ -1337,6 +1349,12 @@ public final class MediaStore { 
            }



            public static Uri getContentUriForPath(String path) {

                for (String ep : EXTERNAL_PATHS) {

                    if (path.startsWith(ep)) {

                        return EXTERNAL_CONTENT_URI;

                    }

                }



                return (path.startsWith(Environment.getExternalStorageDirectory().getPath()) ?

                        EXTERNAL_CONTENT_URI : INTERNAL_CONTENT_URI);

            }