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

Commit a0d07abf authored by Beverly's avatar Beverly
Browse files

Add new zen rules to config 

Bug introduced in ag/5423274 mistakenly stopped new
rules from being added to the ZenModeConfig

Test: atest ZenModeHelperTest, manual
Change-Id: I7aeab92b2b6242a88dfc0294c771ff3ca1fe08db
Fixes: 119896084
parent 6f4e2719

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

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ public class ZenModeHelper { 
            newConfig = mConfig.copy();

            ZenRule rule = new ZenRule();

            populateZenRule(automaticZenRule, rule, true);

            newConfig.automaticRules.put(rule.id, rule);

            if (setConfigLocked(newConfig, reason, rule.component, true)) {

                return rule.id;

            } else {

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

+20 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import static org.mockito.Mockito.when; 


import android.app.AppGlobals;

import android.app.AppOpsManager;

import android.app.AutomaticZenRule;

import android.app.NotificationManager;

import android.app.NotificationManager.Policy;

import android.content.ComponentName;
@@ -1097,6 +1098,25 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        assertFalse(Objects.equals(defaultRuleName, ruleAfterUpdating.name)); // update name

    }



    @Test

    public void testAddAutomaticZenRule() {

        AutomaticZenRule zenRule = new AutomaticZenRule("name",

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

                ZenModeConfig.toScheduleConditionId(new ScheduleInfo()),

                NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);

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



        assertTrue(id != null);

        ZenModeConfig.ZenRule ruleInConfig = mZenModeHelperSpy.mConfig.automaticRules.get(id);

        assertTrue(ruleInConfig != null);

        assertEquals(zenRule.isEnabled(), ruleInConfig.enabled);

        assertEquals(zenRule.isModified(), ruleInConfig.modified);

        assertEquals(zenRule.getConditionId(), ruleInConfig.conditionId);

        assertEquals(NotificationManager.zenModeFromInterruptionFilter(

                zenRule.getInterruptionFilter(), -1), ruleInConfig.zenMode);

        assertEquals(zenRule.getName(), ruleInConfig.name);

    }



    private void setupZenConfig() {

        mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        mZenModeHelperSpy.mConfig.allowAlarms = false;