From 447575fca9466d24cffe422e50c5fbff621bb767 Mon Sep 17 00:00:00 2001 From: Lais Andrade Date: Thu, 23 May 2024 20:58:57 +0000 Subject: Use string from EXTRA_RINGTONE_TITLE SoundPicker intent Make sure we display the Intent extras as string, not spannable char sequences. Change-Id: Ifd08941179ee809ee038e25be9d92a283e7ab2cc Fix: 197874968 Test: Launch SoundPicker with CharSequence intent extra --- .../src/com/android/soundpicker/RingtonePickerActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java index ee81813b4245..0dd9275503a9 100644 --- a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java +++ b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java @@ -36,6 +36,7 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.MediaStore; import android.provider.Settings; +import android.text.Html; import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; @@ -253,6 +254,9 @@ public final class RingtonePickerActivity extends AlertActivity implements } else { p.mTitle = getString(com.android.internal.R.string.ringtone_picker_title); } + } else { + // Make sure intents don't inject HTML elements. + p.mTitle = Html.escapeHtml(p.mTitle.toString()); } setupAlert(); -- cgit v1.2.3-59-g8ed1b