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

Commit 436b7b56 authored by nobuhiko saitou's avatar nobuhiko saitou Committed by Takahiro Aizawa
Browse files

Add OEM_SOUNDS_DIR variable 

Add OEM_SOUNDS_DIR variable
And add judgment of OEM_SOUNDS_DIR in isSystemSoundWithMetadata.

Test: build and check sound like ringtone etc
Bug: 79123178

Change-Id: Ib432910c7a99695e73c88480b7028be1c9d04702
parent c39d08dd

media/java/android/media/MediaScanner.java

+6 −2
Original line number Diff line number Diff line
@@ -159,8 +159,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 = {
@@ -1192,6 +1193,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)) {