Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 018edf2c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I2e8f67e7,Ia5778bf4 

* changes:
  Send DND broadcasts to approved DND apps
  Fix crash when disabling notification listeners
parents da241c53 4c456dd0

services/core/java/com/android/server/notification/ManagedServices.java

+17 −0
Original line number Diff line number Diff line
@@ -767,6 +767,23 @@ abstract public class ManagedServices { 
        return installed;

    }



    protected Set<String> getAllowedPackages() {

        final Set<String> allowedPackages = new ArraySet<>();

        for (int k = 0; k < mApproved.size(); k++) {

            ArrayMap<Boolean, ArraySet<String>> allowedByType = mApproved.valueAt(k);

            for (int i = 0; i < allowedByType.size(); i++) {

                final ArraySet<String> allowed = allowedByType.valueAt(i);

                for (int j = 0; j < allowed.size(); j++) {

                    String pkgName = getPackageName(allowed.valueAt(j));

                    if (!TextUtils.isEmpty(pkgName)) {

                        allowedPackages.add(pkgName);

                    }

                }

            }

        }

        return allowedPackages;

    }



    private void trimApprovedListsAccordingToInstalledServices() {

        int N = mApproved.size();

        for (int i = 0 ; i < N; i++) {

services/core/java/com/android/server/notification/NotificationManagerService.java

+10 −2
Original line number Diff line number Diff line
@@ -1701,8 +1701,16 @@ public class NotificationManagerService extends SystemService { 
    }



    private void sendRegisteredOnlyBroadcast(String action) {

        getContext().sendBroadcastAsUser(new Intent(action)

                .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY), UserHandle.ALL, null);

        Intent intent = new Intent(action);

        getContext().sendBroadcastAsUser(intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY),

                UserHandle.ALL, null);

        // explicitly send the broadcast to all DND packages, even if they aren't currently running

        intent.setFlags(0);

        final Set<String> dndApprovedPackages = mConditionProviders.getAllowedPackages();

        for (String pkg : dndApprovedPackages) {

            intent.setPackage(pkg);

            getContext().sendBroadcastAsUser(intent, UserHandle.ALL);

        }

    }



    @Override

services/core/java/com/android/server/notification/ZenModeHelper.java

+1 −2
Original line number Diff line number Diff line
@@ -375,8 +375,7 @@ public class ZenModeHelper { 
            newConfig = mConfig.copy();

            for (int i = newConfig.automaticRules.size() - 1; i >= 0; i--) {

                ZenRule rule = newConfig.automaticRules.get(newConfig.automaticRules.keyAt(i));

                if (rule.component.getPackageName().equals(packageName)

                        && canManageAutomaticZenRule(rule)) {

                if (rule.pkg.equals(packageName) && canManageAutomaticZenRule(rule)) {

                    newConfig.automaticRules.removeAt(i);

                }

            }

services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java

+25 −1
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ public class ManagedServicesTest extends UiServiceTestCase { 
    }



    @Test

    public void testGetAllowedPackages() throws Exception {

    public void testGetAllowedPackages_byUser() throws Exception {

        for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {

            ManagedServices service = new TestManagedServices(getContext(), mLock, mUserProfiles,

                    mIpm, approvalLevel);
@@ -680,6 +680,30 @@ public class ManagedServicesTest extends UiServiceTestCase { 
        assertEquals(0, service.getAllowedComponents(10).size());

    }



    @Test

    public void testGetAllowedPackages() throws Exception {

        ManagedServices service = new TestManagedServices(getContext(), mLock, mUserProfiles,

                mIpm, APPROVAL_BY_COMPONENT);

        loadXml(service);

        service.mApprovalLevel = APPROVAL_BY_PACKAGE;

        loadXml(service);



        List<String> allowedPackages = new ArrayList<>();

        allowedPackages.add("this.is.a.package.name");

        allowedPackages.add("another.package");

        allowedPackages.add("secondary");

        allowedPackages.add("this.is.another.package");

        allowedPackages.add("package");

        allowedPackages.add("component");

        allowedPackages.add("bananas!");



        Set<String> actual = service.getAllowedPackages();

        assertEquals(allowedPackages.size(), actual.size());

        for (String pkg : allowedPackages) {

            assertTrue(actual.contains(pkg));

        }

    }



    @Test

    public void testOnUserRemoved() throws Exception {

        for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {