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

Commit f0b23996 authored by Yuri Lin's avatar Yuri Lin Committed by Automerger Merge Worker
Browse files

Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into... 

Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into tm-qpr-dev am: 00a9ce6f am: b845c018

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744478



Change-Id: I6736d2bc1121abcec47675aea2f6159f5e48077d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71561670 b845c018

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

+1 −6
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 (!isSystemRule(automaticZenRule)) {

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

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

            if (component == null) {

                component = getActivityInfo(automaticZenRule.getConfigurationActivity());
@@ -582,11 +582,6 @@ 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

+30 −0
Original line number Diff line number Diff line
@@ -1671,6 +1671,36 @@ 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",