diff options
| author | 2024-07-31 13:16:22 +0000 | |
|---|---|---|
| committer | 2024-07-31 13:16:22 +0000 | |
| commit | def0fc897971bb4e6c3301c2a7f9e7e5bc1b64cb (patch) | |
| tree | 02468cfe9b05282b6502b84576cf4b9ff8138ca1 | |
| parent | 7a4600811a773f0e687a0c4f1f30e07fd1f3c7db (diff) | |
| parent | 4bee3271fb8ef44dc00896a0fcf84962b2237698 (diff) | |
Merge "Stop using escape HTML on SoundPicker title from intent" into main am: 4bee3271fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3195551
Change-Id: Id937a59793fecb195c7706175c7828359228c9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java index 0dd9275503a9..8c3cce4087c1 100644 --- a/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java +++ b/packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java @@ -255,8 +255,8 @@ public final class RingtonePickerActivity extends AlertActivity implements 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()); + // Make sure intents don't inject spannable elements. + p.mTitle = p.mTitle.toString(); } setupAlert(); |