Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure ringtones are sorted correctly.

Browse Source
This commit is contained in:
Marco Nelissen
2009-07-06 10:57:01 -07:00
parent 816cf52abd
commit 899725b05d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/java/android/media/RingtoneManager.java
View File

@@ -176,17 +176,20 @@ public class RingtoneManager {
private static final String[] INTERNAL_COLUMNS = new String[] { private static final String[] INTERNAL_COLUMNS = new String[] {
MediaStore.Audio.Media._ID, MediaStore.Audio.Media.TITLE, 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[] { private static final String[] DRM_COLUMNS = new String[] {
DrmStore.Audio._ID, DrmStore.Audio.TITLE, 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[] { private static final String[] MEDIA_COLUMNS = new String[] {
MediaStore.Audio.Media._ID, MediaStore.Audio.Media.TITLE, 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 @@ public class RingtoneManager {
final Cursor mediaCursor = getMediaRingtones(); final Cursor mediaCursor = getMediaRingtones();
return mCursor = new SortCursor(new Cursor[] { internalCursor, drmCursor, mediaCursor }, return mCursor = new SortCursor(new Cursor[] { internalCursor, drmCursor, mediaCursor },
MediaStore.MediaColumns.TITLE); MediaStore.Audio.Media.DEFAULT_SORT_ORDER);
} }
/** /**