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

Disable additional pkgs on DND perm page

Browse Source 
Because they will always have access because they hold
the permission to manage notifications.

Test: manual
Fixes: 191973668
Change-Id: I456aec41b401bba6f10d9ea969e2fb8c4300825d
This commit is contained in:
Julia Reynolds
2021-06-25 09:17:41 -04:00
parent afc0bd763c
commit 4c7981eb0d
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
View File

@@ -50,13 +50,24 @@ public class ZenAccessController extends BasePreferenceController {
} }
public static Set<String> getPackagesRequestingNotificationPolicyAccess() { public static Set<String> getPackagesRequestingNotificationPolicyAccess() {
final String[] PERM = {
android.Manifest.permission.ACCESS_NOTIFICATION_POLICY
};
return getPackagesWithPermissions(PERM);
}
public static Set<String> getPackagesWithManageNotifications() {
final String[] PERM = {
android.Manifest.permission.MANAGE_NOTIFICATIONS
};
return getPackagesWithPermissions(PERM);
}
public static Set<String> getPackagesWithPermissions(String[] permList) {
final ArraySet<String> requestingPackages = new ArraySet<>(); final ArraySet<String> requestingPackages = new ArraySet<>();
try { try {
final String[] PERM = {
android.Manifest.permission.ACCESS_NOTIFICATION_POLICY
};
final ParceledListSlice list = AppGlobals.getPackageManager() final ParceledListSlice list = AppGlobals.getPackageManager()
.getPackagesHoldingPermissions(PERM, 0 /*flags*/, .getPackagesHoldingPermissions(permList, 0 /*flags*/,
ActivityManager.getCurrentUser()); ActivityManager.getCurrentUser());
final List<PackageInfo> pkgs = list.getList(); final List<PackageInfo> pkgs = list.getList();
if (pkgs != null) { if (pkgs != null) {

2
src/com/android/settings/notification/zen/ZenAccessSettings.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.notification.zen; package com.android.settings.notification.zen;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.ActivityManager;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
@@ -117,6 +118,7 @@ public class ZenAccessSettings extends EmptyTextSettings implements
} }
ArraySet<String> autoApproved = new ArraySet<>(); ArraySet<String> autoApproved = new ArraySet<>();
autoApproved.addAll(mNoMan.getEnabledNotificationListenerPackages()); autoApproved.addAll(mNoMan.getEnabledNotificationListenerPackages());
autoApproved.addAll(ZenAccessController.getPackagesWithManageNotifications());
Collections.sort(apps, new PackageItemInfo.DisplayNameComparator(mPkgMan)); Collections.sort(apps, new PackageItemInfo.DisplayNameComparator(mPkgMan));
for (ApplicationInfo app : apps) { for (ApplicationInfo app : apps) {
final String pkg = app.packageName; final String pkg = app.packageName;