commit 37b38f872f3a48fbe8482650e208ce225481f863
author Christine Franks <christyfranks@google.com> Sat Aug 03 14:47:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 03 14:47:40 2019 +0000
tree 3316c1507cecde0b90406c5e624ad0da2ddd4577
parent 8e3b2020702070a22a030b74bf938de9506358ea
parent ea14373666df5b5989fc8cb99eb01e3d0da5f9e5

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

src/com/android/settings/notification/RingtonePreferenceControllerBase.java

diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
index 733d0d9..c82afb4 100644
--- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
+++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
@@ -55,7 +55,7 @@
 
         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 */);