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

Commit 95472587 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge changes from topic "bugfix_content_path" am: aa642187 am: f8ad4749 

am: 8fe3754f

Change-Id: I1718c1c34860b23d7dbe22bb6350825483e41fd6
parents 7cd3eb1a 8fe3754f

core/java/android/provider/MediaStore.java

+3 −20
Original line number Diff line number Diff line
@@ -1318,18 +1318,6 @@ 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.
@@ -1343,14 +1331,9 @@ 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);

                return (path.startsWith(

                        Environment.getStorageDirectory().getAbsolutePath() + "/")

                        ? EXTERNAL_CONTENT_URI : INTERNAL_CONTENT_URI);

            }



            /**

media/java/android/media/MediaScanner.java

+6 −2
Original line number Diff line number Diff line
@@ -160,8 +160,9 @@ public class MediaScanner implements AutoCloseable { 


    public static final String SCANNED_BUILD_PREFS_NAME = "MediaScanBuild";

    public static final String LAST_INTERNAL_SCAN_FINGERPRINT = "lastScanFingerprint";

    private static final String SYSTEM_SOUNDS_DIR = "/system/media/audio";

    private static final String PRODUCT_SOUNDS_DIR = "/product/media/audio";

    private static final String SYSTEM_SOUNDS_DIR = Environment.getRootDirectory() + "/media/audio";

    private static final String OEM_SOUNDS_DIR = Environment.getOemDirectory() + "/media/audio";

    private static final String PRODUCT_SOUNDS_DIR = Environment.getProductDirectory() + "/media/audio";

    private static String sLastInternalScanFingerprint;



    private static final String[] ID3_GENRES = {
@@ -1193,6 +1194,9 @@ public class MediaScanner implements AutoCloseable { 
        if (path.startsWith(SYSTEM_SOUNDS_DIR + ALARMS_DIR)

                || path.startsWith(SYSTEM_SOUNDS_DIR + RINGTONES_DIR)

                || path.startsWith(SYSTEM_SOUNDS_DIR + NOTIFICATIONS_DIR)

                || path.startsWith(OEM_SOUNDS_DIR + ALARMS_DIR)

                || path.startsWith(OEM_SOUNDS_DIR + RINGTONES_DIR)

                || path.startsWith(OEM_SOUNDS_DIR + NOTIFICATIONS_DIR)

                || path.startsWith(PRODUCT_SOUNDS_DIR + ALARMS_DIR)

                || path.startsWith(PRODUCT_SOUNDS_DIR + RINGTONES_DIR)

                || path.startsWith(PRODUCT_SOUNDS_DIR + NOTIFICATIONS_DIR)) {