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

Commit 513d8068 authored by Marco Nelissen's avatar Marco Nelissen Committed by The Android Open Source Project
Browse files

am 899725b0: Make sure ringtones are sorted correctly. 

Merge commit '899725b0'

* commit '899725b0':
  Make sure ringtones are sorted correctly.
parents ff7d0e2b 899725b0

media/java/android/media/RingtoneManager.java

+7 −4
Original line number Diff line number Diff line
@@ -179,17 +179,20 @@ public class RingtoneManager { 
    

    private static final String[] INTERNAL_COLUMNS = new String[] {

        MediaStore.Audio.Media._ID, MediaStore.Audio.Media.TITLE,

        "\"" + MediaStore.Audio.Media.INTERNAL_CONTENT_URI + "\""

        "\"" + MediaStore.Audio.Media.INTERNAL_CONTENT_URI + "\"",

        MediaStore.Audio.Media.TITLE_KEY

    };



    private static final String[] DRM_COLUMNS = new String[] {

        DrmStore.Audio._ID, DrmStore.Audio.TITLE,

        "\"" + DrmStore.Audio.CONTENT_URI + "\""

        "\"" + DrmStore.Audio.CONTENT_URI + "\"",

        DrmStore.Audio.TITLE + " AS " + MediaStore.Audio.Media.TITLE_KEY

    };



    private static final String[] MEDIA_COLUMNS = new String[] {

        MediaStore.Audio.Media._ID, MediaStore.Audio.Media.TITLE,

        "\"" + MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + "\""

        "\"" + MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + "\"",

        MediaStore.Audio.Media.TITLE_KEY

    };

    

    /**
@@ -364,7 +367,7 @@ public class RingtoneManager { 
        final Cursor mediaCursor = getMediaRingtones();

             

        return mCursor = new SortCursor(new Cursor[] { internalCursor, drmCursor, mediaCursor },

                MediaStore.MediaColumns.TITLE);

                MediaStore.Audio.Media.DEFAULT_SORT_ORDER);

    }



    /**