From 8754d40124a93eebfe67a56cce78f7a11b2d5d38 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Thu, 7 Nov 2019 14:06:37 -0500
Subject: [PATCH] Don't disable DND permission settings for apps that have
 disabled NLS

ZenAccessController.getPackagesRequestingNotificationPolicyAccess
was including disabled packages.
We change this behavior to exclude any disabled package

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.applications.specialaccess.zenaccess.ZenAccessControllerTest"
Change-Id: I354b8f0bdbf602d1f35233d5003ce09f01df3cb2
Fix: 141318822
---
 .../specialaccess/zenaccess/ZenAccessController.java          | 4 +++-
 src/com/android/settings/notification/ZenAccessSettings.java  | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
index 946599b4aa8..9c99254292d 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
@@ -70,7 +70,9 @@ public class ZenAccessController extends BasePreferenceController {
             final List<PackageInfo> pkgs = list.getList();
             if (pkgs != null) {
                 for (PackageInfo info : pkgs) {
-                    requestingPackages.add(info.packageName);
+                    if (info.applicationInfo.enabled) {
+                        requestingPackages.add(info.packageName);
+                    }
                 }
             }
         } catch (RemoteException e) {
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index 34b5354f161..d9c57c71dff 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -114,7 +114,6 @@ public class ZenAccessSettings extends EmptyTextSettings implements
         }
         ArraySet<String> autoApproved = new ArraySet<>();
         autoApproved.addAll(mNoMan.getEnabledNotificationListenerPackages());
-        requesting.addAll(autoApproved);
         Collections.sort(apps, new PackageItemInfo.DisplayNameComparator(mPkgMan));
         for (ApplicationInfo app : apps) {
             final String pkg = app.packageName;