diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 15:03:40 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 15:03:40 +0100 |
| commit | ae08d65dc25290d8d411ff44d7eb07f4cb74e8c6 (patch) | |
| tree | 1afe8d827942011eafc2afebd0ae158b24f8b38e /media/java/android/media/Ringtone.java | |
| parent | 90e1e6b2e9b79d444545d729561cf7fc099a8f10 (diff) | |
| parent | 2df190c3a2ed1e339bb34c175fa227f90e7cbb02 (diff) | |
| download | frameworks_base-ae08d65dc25290d8d411ff44d7eb07f4cb74e8c6.zip frameworks_base-ae08d65dc25290d8d411ff44d7eb07f4cb74e8c6.tar.gz frameworks_base-ae08d65dc25290d8d411ff44d7eb07f4cb74e8c6.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0
Diffstat (limited to 'media/java/android/media/Ringtone.java')
| -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 |