PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581

Change-Id: I11ee7cc3bfd291f32e602eff65ce93ba57bcc407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matías Hernández
2023-06-14 12:52:41 +00:00
committed by Automerger Merge Worker
parent 8befc27425 173cc267e0
commit d7608c84b4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/notification/NotificationAccessSettings.java
View File

@@ -94,12 +94,6 @@ public class NotificationAccessSettings extends EmptyTextSettings {
.setNoun(CONFIG.noun) .setNoun(CONFIG.noun)
.setSetting(CONFIG.setting) .setSetting(CONFIG.setting)
.setTag(CONFIG.tag) .setTag(CONFIG.tag)
.setValidator(info -> {
if (info.getComponentName().flattenToString().length() > MAX_CN_LENGTH) {
return false;
}
return true;
})
.build(); .build();
mServiceListing.addCallback(this::updateList); mServiceListing.addCallback(this::updateList);
setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext)); setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext));
@@ -140,6 +134,11 @@ public class NotificationAccessSettings extends EmptyTextSettings {
services.sort(new PackageItemInfo.DisplayNameComparator(mPm)); services.sort(new PackageItemInfo.DisplayNameComparator(mPm));
for (ServiceInfo service : services) { for (ServiceInfo service : services) {
final ComponentName cn = new ComponentName(service.packageName, service.name); final ComponentName cn = new ComponentName(service.packageName, service.name);
boolean isAllowed = mNm.isNotificationListenerAccessGranted(cn);
if (!isAllowed && cn.flattenToString().length() > MAX_CN_LENGTH) {
continue;
}
CharSequence title = null; CharSequence title = null;
try { try {
title = mPm.getApplicationInfoAsUser( title = mPm.getApplicationInfoAsUser(
@@ -154,7 +153,7 @@ public class NotificationAccessSettings extends EmptyTextSettings {
pref.setIcon(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo, pref.setIcon(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo,
UserHandle.getUserId(service.applicationInfo.uid))); UserHandle.getUserId(service.applicationInfo.uid)));
pref.setKey(cn.flattenToString()); pref.setKey(cn.flattenToString());
pref.setSummary(mNm.isNotificationListenerAccessGranted(cn) pref.setSummary(isAllowed
? R.string.app_permission_summary_allowed ? R.string.app_permission_summary_allowed
: R.string.app_permission_summary_not_allowed); : R.string.app_permission_summary_not_allowed);
if (managedProfileId != UserHandle.USER_NULL if (managedProfileId != UserHandle.USER_NULL