diff options
author | kaiyiz <kaiyiz@codeaurora.org> | 2015-04-02 17:44:34 +0800 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2016-07-05 09:39:05 -0700 |
commit | 0cabc1dcc243c3322c22bac6b46956a577486144 (patch) | |
tree | 6ae130764beec243e092e6455d6b9cf5f9352af1 /media | |
parent | 70dd4a2cb1ab15820cc29b683d542bc7440cee29 (diff) | |
download | frameworks_base-0cabc1dcc243c3322c22bac6b46956a577486144.zip frameworks_base-0cabc1dcc243c3322c22bac6b46956a577486144.tar.gz frameworks_base-0cabc1dcc243c3322c22bac6b46956a577486144.tar.bz2 |
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
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/Ringtone.java | 5 |
1 files changed, 5 insertions, 0 deletions
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 |