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

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

Merge "Allow updates to DND configuration activities" into sc-dev

parents db96662e b7ef42dc

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

+10 −9
Original line number Diff line number Diff line
@@ -586,11 +586,20 @@ public class ZenModeHelper { 
    }



    private void populateZenRule(AutomaticZenRule automaticZenRule, ZenRule rule, boolean isNew) {

        rule.name = automaticZenRule.getName();

        rule.condition = null;

        rule.conditionId = automaticZenRule.getConditionId();

        rule.enabled = automaticZenRule.isEnabled();

        rule.modified = automaticZenRule.isModified();

        rule.zenPolicy = automaticZenRule.getZenPolicy();

        rule.zenMode = NotificationManager.zenModeFromInterruptionFilter(

                automaticZenRule.getInterruptionFilter(), Global.ZEN_MODE_OFF);

        rule.configurationActivity = automaticZenRule.getConfigurationActivity();



        if (isNew) {

            rule.id = ZenModeConfig.newRuleId();

            rule.creationTime = System.currentTimeMillis();

            rule.component = automaticZenRule.getOwner();

            rule.configurationActivity = automaticZenRule.getConfigurationActivity();

            rule.pkg = (rule.component != null)

                    ? rule.component.getPackageName()

                    : rule.configurationActivity.getPackageName();
@@ -599,14 +608,6 @@ public class ZenModeHelper { 
        if (rule.enabled != automaticZenRule.isEnabled()) {

            rule.snoozing = false;

        }

        rule.name = automaticZenRule.getName();

        rule.condition = null;

        rule.conditionId = automaticZenRule.getConditionId();

        rule.enabled = automaticZenRule.isEnabled();

        rule.modified = automaticZenRule.isModified();

        rule.zenPolicy = automaticZenRule.getZenPolicy();

        rule.zenMode = NotificationManager.zenModeFromInterruptionFilter(

                automaticZenRule.getInterruptionFilter(), Global.ZEN_MODE_OFF);

    }



    protected AutomaticZenRule createAutomaticZenRule(ZenRule rule) {