From f7ae52bed633d407767e54e6f72bd03e636d441f Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Thu, 1 Apr 2021 13:44:26 +0800 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. Test: Built the apk and saw single line title. Bug: 169936038 Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e --- .../deviceadmin/DeviceAdminListPreferenceController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java index e25bb1e4fc0..ead5a5a7358 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java @@ -207,6 +207,7 @@ public class DeviceAdminListPreferenceController extends BasePreferenceControlle return true; }); pref.setOnPreferenceChangeListener((preference, newValue) -> false); + pref.setSingleLineTitle(true); } /**