Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev

2019-08-03 14:47:40 +00:00
parent 8e3b202070 ea14373666
commit 37b38f872f
1 changed files with 1 additions and 1 deletions
--- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
+++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
@@ -55,7 +55,7 @@ public abstract class RingtonePreferenceControllerBase extends AbstractPreferenc

        final CharSequence summary;
        if (ringtoneUri == null) {
-            summary = null;
+            summary = mContext.getString(com.android.internal.R.string.ringtone_silent);
        } else {
            summary = Ringtone.getTitle(
                    mContext, ringtoneUri, false /* followSettingsUri */, true /* allowRemote */);