From 95cc34cd98709100eeb7a4ceafdb7c8909f815f9 Mon Sep 17 00:00:00 2001
From: Beth Thibodeau <ethibodeau@google.com>
Date: Thu, 11 Mar 2021 18:01:35 -0500
Subject: [PATCH] Sanitize text fields

Bug: 180518039
Test: manual, verify no ANR and media displays normally
Change-Id: I1c99e3257107f71eb5049ef19614e2c6836f808c
---
 .../src/com/android/systemui/media/MediaControlPanel.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
index bffe05085887d..2bf75f2ddb0b5 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
@@ -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;
@@ -261,7 +262,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();
@@ -269,7 +270,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);