Merge "Sanitize text fields" into rvc-qpr-dev am: 6f6c9c22e4 am: c7ccd6826d

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

Change-Id: Id15ee260996bb94970ef49b7a03c1ea1b296a407
This commit is contained in:
Beth Thibodeau
2021-04-02 22:57:38 +00:00
committed by Automerger Merge Worker

View File

@@ -16,6 +16,7 @@
package com.android.systemui.media;
import static android.app.Notification.safeCharSequence;
import static android.provider.Settings.ACTION_MEDIA_CONTROLS_SETTINGS;
import android.app.PendingIntent;
@@ -266,7 +267,7 @@ public class MediaControlPanel {
// Song name
TextView titleText = mViewHolder.getTitleText();
titleText.setText(data.getSong());
titleText.setText(safeCharSequence(data.getSong()));
// App title
TextView appName = mViewHolder.getAppName();
@@ -277,7 +278,7 @@ public class MediaControlPanel {
// Artist name
TextView artistText = mViewHolder.getArtistText();
artistText.setText(data.getArtist());
artistText.setText(safeCharSequence(data.getArtist()));
// Transfer chip
mViewHolder.getSeamless().setVisibility(View.VISIBLE);