commit 899725b05dd5c8c51f9f802d4f0a7190532ce0a5
author Marco Nelissen <marcone@google.com> Mon Jul 06 10:57:01 2009 -0700
committer Marco Nelissen <marcone@google.com> Mon Jul 06 10:57:01 2009 -0700
tree 120b38f309ea59d2c8032bc3ff6c162fb073b5b6
parent 816cf52abd8f45770f0ac922bbb819184ed4b90f

Make sure ringtones are sorted correctly.

media/java/android/media/RingtoneManager.java

diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index 8f05cec..42edae6 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -176,17 +176,20 @@
     
     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
     };
     
     /**
@@ -361,7 +364,7 @@
         final Cursor mediaCursor = getMediaRingtones();
              
         return mCursor = new SortCursor(new Cursor[] { internalCursor, drmCursor, mediaCursor },
-                MediaStore.MediaColumns.TITLE);
+                MediaStore.Audio.Media.DEFAULT_SORT_ORDER);
     }
 
     /**