Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91d7511b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop using escape HTML on SoundPicker title from intent" into main am:...

Merge "Stop using escape HTML on SoundPicker title from intent" into main am: 4bee3271 am: def0fc89

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3195551



Change-Id: I56e44408841a07a24a37764ead20641574edb8a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1d2edf7 def0fc89
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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();