summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media/java/android/media/RingtoneManager.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java
index 70d29d2d1ebd..44026e428d67 100644
--- a/media/java/android/media/RingtoneManager.java
+++ b/media/java/android/media/RingtoneManager.java
@@ -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);
}
/**