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

Commit b1ad676f authored by Yuri Lin's avatar Yuri Lin Committed by Android Build Coastguard Worker
Browse files

Revert "Check rule package name in ZenModeHelper.addAutomaticRule" 

This reverts commit b6d04416.

Reason for revert: broke DND schedules in multi-user mode b/257477671

Change-Id: Idf32ab7ebd132ee460504976ba31252fd4da47fa
(cherry picked from commit 9223d270)
Merged-In: Idf32ab7ebd132ee460504976ba31252fd4da47fa
parent 52a404fa

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

+6 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ public class ZenModeHelper { 


    public String addAutomaticZenRule(String pkg, AutomaticZenRule automaticZenRule,

            String reason) {

        if (!ZenModeConfig.SYSTEM_AUTHORITY.equals(pkg)) {

        if (!isSystemRule(automaticZenRule)) {

            PackageItemInfo component = getServiceInfo(automaticZenRule.getOwner());

            if (component == null) {

                component = getActivityInfo(automaticZenRule.getConfigurationActivity());
@@ -582,6 +582,11 @@ public class ZenModeHelper { 
        }

    }



    private boolean isSystemRule(AutomaticZenRule rule) {

        return rule.getOwner() != null

                && ZenModeConfig.SYSTEM_AUTHORITY.equals(rule.getOwner().getPackageName());

    }



    private ServiceInfo getServiceInfo(ComponentName owner) {

        Intent queryIntent = new Intent();

        queryIntent.setComponent(owner);

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

+0 −30
Original line number Diff line number Diff line
@@ -1671,36 +1671,6 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        }

    }



    @Test

    public void testAddAutomaticZenRule_claimedSystemOwner() {

        // Make sure anything that claims to have a "system" owner but not actually part of the

        // system package still gets limited on number of rules

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

            ScheduleInfo si = new ScheduleInfo();

            si.startHour = i;

            AutomaticZenRule zenRule = new AutomaticZenRule("name" + i,

                    new ComponentName("android", "ScheduleConditionProvider" + i),

                    null, // configuration activity

                    ZenModeConfig.toScheduleConditionId(si),

                    new ZenPolicy.Builder().build(),

                    NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);

            String id = mZenModeHelperSpy.addAutomaticZenRule("pkgname", zenRule, "test");

            assertNotNull(id);

        }

        try {

            AutomaticZenRule zenRule = new AutomaticZenRule("name",

                    new ComponentName("android", "ScheduleConditionProviderFinal"),

                    null, // configuration activity

                    ZenModeConfig.toScheduleConditionId(new ScheduleInfo()),

                    new ZenPolicy.Builder().build(),

                    NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);

            String id = mZenModeHelperSpy.addAutomaticZenRule("pkgname", zenRule, "test");

            fail("allowed too many rules to be created");

        } catch (IllegalArgumentException e) {

            // yay

        }

    }



    @Test

    public void testAddAutomaticZenRule_CA() {

        AutomaticZenRule zenRule = new AutomaticZenRule("name",