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

Commit eaad0977 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

Fixed column inconsistency for theme-based ringtones. 

Theme ringtones returned by the RingtoneManager must use the title
column to guarantee column naming consistency with other ringtone
sources.  Without this it's possible that the RingtonePickerActivity
will crash when trying to read the 'title' label column.

Change-Id: I133fe7b0c14981d3c9c5422e0a70ed2ef7572a25
parent b4b7c398

media/java/android/media/RingtoneManager.java

+2 −2
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ public class RingtoneManager { 
    private Cursor getThemeRegularRingtones() {

        if ((mType & TYPE_RINGTONE) != 0) {

            return query(Uri.parse("content://com.tmobile.thememanager.themes/themes"),

                    new String[] { "_id", "ringtone_name", "ringtone_uri",

                    new String[] { "_id", "ringtone_name AS " + MEDIA_COLUMNS[1], "ringtone_uri",

                        "ringtone_name_key AS " + MEDIA_COLUMNS[3] },

                    getThemeWhereClause("ringtone_uri"), null, MEDIA_COLUMNS[3]);

        } else {
@@ -548,7 +548,7 @@ public class RingtoneManager { 
    private Cursor getThemeNotificationRingtones() {

        if ((mType & TYPE_NOTIFICATION) != 0) {

            return query(Uri.parse("content://com.tmobile.thememanager.themes/themes"),

                    new String[] { "_id", "notif_ringtone_name", "notif_ringtone_uri",

                    new String[] { "_id", "notif_ringtone_name AS " + MEDIA_COLUMNS[1], "notif_ringtone_uri",

                        "notif_ringtone_name_key AS " + MEDIA_COLUMNS[3] },

                    getThemeWhereClause("notif_ringtone_uri"), null, MEDIA_COLUMNS[3]);

        } else {