From 121041cf587ac70cce5721a387c0f43a3c2e79b1 Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Fri, 12 Mar 2021 08:33:28 +0000 Subject: [PATCH] Only display single line for title MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a malicious device admin app’s name includes a bunch of CRLF characters, it will cause incorrect shows and selection confusion in Settings Device admin apps listView. Change-Id: Ifc3cc689a221830c6687b7d69cf86f1ed7f2d698 Test: Built the apk and saw single line title. Bug: 169936038 Merged-In: I0c9d80273ed752c5a83afcad18d67400bcfc1618 --- .../android/settings/widget/FilterTouchesSwitchPreference.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java index 1b4d6817bfb..57218545fe4 100644 --- a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java +++ b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java @@ -47,6 +47,7 @@ public class FilterTouchesSwitchPreference extends SwitchPreference { @Override public void onBindViewHolder(PreferenceViewHolder holder) { + setSingleLineTitle(true); super.onBindViewHolder(holder); final View switchView = holder.findViewById(android.R.id.switch_widget); if (switchView != null) {