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

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

Change-Id: I3d057657d3a9385a38adfd050df72e7855e2e06b
This commit is contained in:
Beth Thibodeau
2021-04-02 22:11:07 +00:00
committed by Automerger Merge Worker

View File

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