Merge "Don't disable DND permission settings for apps that have disabled NLS"

This commit is contained in:
Jay Aliomer
2019-11-08 16:38:12 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 2 deletions

View File

@@ -70,7 +70,9 @@ public class ZenAccessController extends BasePreferenceController {
final List<PackageInfo> pkgs = list.getList(); final List<PackageInfo> pkgs = list.getList();
if (pkgs != null) { if (pkgs != null) {
for (PackageInfo info : pkgs) { for (PackageInfo info : pkgs) {
requestingPackages.add(info.packageName); if (info.applicationInfo.enabled) {
requestingPackages.add(info.packageName);
}
} }
} }
} catch (RemoteException e) { } catch (RemoteException e) {

View File

@@ -114,7 +114,6 @@ public class ZenAccessSettings extends EmptyTextSettings implements
} }
ArraySet<String> autoApproved = new ArraySet<>(); ArraySet<String> autoApproved = new ArraySet<>();
autoApproved.addAll(mNoMan.getEnabledNotificationListenerPackages()); autoApproved.addAll(mNoMan.getEnabledNotificationListenerPackages());
requesting.addAll(autoApproved);
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;