From 0cabc1dcc243c3322c22bac6b46956a577486144 Mon Sep 17 00:00:00 2001 From: kaiyiz Date: Thu, 2 Apr 2015 17:44:34 +0800 Subject: media:Modify the display of system default ringtone when it is none. After we set the sound of calender use the default ringtone , if the system default ringtone is none, the sound of calender will show unknown ringtone. Make sound of calender not show unknown ringtone when the system default ringtone is none. CYNGNOS-3160 CRs-fixed: 812323 Change-Id: Idbc488748a81b88bb7a0df49e25d6a8cf6ba3826 --- media/java/android/media/Ringtone.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'media') diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index 2f96d1f..b92b5d9 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -222,6 +222,11 @@ public class Ringtone { actualUri = RingtoneManager.getActualDefaultRingtoneUri(context, RingtoneManager.getDefaultType(uri)); } + if (actualUri == null) { + title = context + .getString(com.android.internal.R.string.ringtone_default); + return title; + } String actualTitle = getTitle( context, actualUri, false /*followSettingsUri*/, allowRemote); title = context -- cgit v1.1