0dde119d7e
QPR3 is delayed a week now Patches pulled from GrapheneOS and checked against CalyxOS Signed-off-by: Tad <tad@spotco.us>
41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Julia Reynolds <juliacr@google.com>
|
|
Date: Tue, 7 Mar 2023 15:44:29 -0500
|
|
Subject: [PATCH 2/2] Don't show NLSes with excessively long component names
|
|
|
|
Test: install test app with long CN
|
|
Test: ServiceListingTest
|
|
Bug: 260570119
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:793257967f165970f8cb0f4cebddab9dcd5d8353)
|
|
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
|
|
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
|
|
---
|
|
.../settings/notification/NotificationAccessSettings.java | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
|
|
index 4ec9ccd814..56d3f0e445 100644
|
|
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
|
|
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
|
|
@@ -65,6 +65,7 @@ public class NotificationAccessSettings extends EmptyTextSettings {
|
|
private static final String TAG = "NotifAccessSettings";
|
|
private static final String ALLOWED_KEY = "allowed";
|
|
private static final String NOT_ALLOWED_KEY = "not_allowed";
|
|
+ private static final int MAX_CN_LENGTH = 500;
|
|
|
|
private static final ManagedServiceSettings.Config CONFIG =
|
|
new ManagedServiceSettings.Config.Builder()
|
|
@@ -101,6 +102,12 @@ public class NotificationAccessSettings extends EmptyTextSettings {
|
|
.setNoun(CONFIG.noun)
|
|
.setSetting(CONFIG.setting)
|
|
.setTag(CONFIG.tag)
|
|
+ .setValidator(info -> {
|
|
+ if (info.getComponentName().flattenToString().length() > MAX_CN_LENGTH) {
|
|
+ return false;
|
|
+ }
|
|
+ return true;
|
|
+ })
|
|
.build();
|
|
mServiceListing.addCallback(this::updateList);
|
|
|