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

Commit ad3841a5 authored by Beverly's avatar Beverly
Browse files

Don't show zen upgrade notification on restore 

- only show the zen upgrade notification if the xml
version is old
- don't reset the automatic rules to default zen rules
if they already contain the default rules

Test: manual restore
Test: ZenModeHelperTest
Change-Id: Ideaf24478ea754e42902d03fd3df14bcad0da860
Fixes: 111842062
parent b80d30d8

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

+18 −11
Original line number Diff line number Diff line
@@ -612,7 +612,11 @@ public class ZenModeHelper { 
                config.manualRule = null;  // don't restore the manual rule

            }



            boolean resetToDefaultRules = true;

            // booleans to determine whether to reset the rules to the default rules

            boolean allRulesDisabled = true;

            boolean hasDefaultRules = config.automaticRules.containsAll(

                    ZenModeConfig.DEFAULT_RULE_IDS);



            long time = System.currentTimeMillis();

            if (config.automaticRules != null && config.automaticRules.size() > 0) {

                for (ZenRule automaticRule : config.automaticRules.values()) {
@@ -622,21 +626,24 @@ public class ZenModeHelper { 
                        automaticRule.condition = null;

                        automaticRule.creationTime = time;

                    }

                    resetToDefaultRules &= !automaticRule.enabled;



                    allRulesDisabled &= !automaticRule.enabled;

                }

            }



            if (config.version < ZenModeConfig.XML_VERSION || forRestore) {

                Settings.Secure.putInt(mContext.getContentResolver(),

                        Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 1);



                // resets zen automatic rules to default

                // if all prev auto rules were disabled on update

                if (resetToDefaultRules) {

            if (!hasDefaultRules && allRulesDisabled

                    && (forRestore || config.version < ZenModeConfig.XML_VERSION)) {

                // reset zen automatic rules to default on restore or upgrade if:

                // - doesn't already have default rules and

                // - all previous automatic rules were disabled

                config.automaticRules = new ArrayMap<>();

                appendDefaultRules(config);

                reason += ", reset to default rules";

            }



            if (config.version < ZenModeConfig.XML_VERSION) {

                Settings.Secure.putInt(mContext.getContentResolver(),

                        Settings.Secure.SHOW_ZEN_UPGRADE_NOTIFICATION, 1);

            } else {

                // devices not restoring/upgrading already have updated zen settings

                Settings.Secure.putInt(mContext.getContentResolver(),

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

+107 −4
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
    public void testReadXml() throws Exception {

        setupZenConfig();



        // automatic zen rule is enabled on upgrade so rules should not be overriden by default

        // automatic zen rule is enabled on upgrade so rules should not be overriden to default

        ArrayMap<String, ZenModeConfig.ZenRule> enabledAutoRule = new ArrayMap<>();

        ZenModeConfig.ZenRule customRule = new ZenModeConfig.ZenRule();

        final ScheduleInfo weeknights = new ScheduleInfo();
@@ -756,7 +756,8 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
    public void testReadXmlResetDefaultRules() throws Exception {

        setupZenConfig();



        // no enabled automatic zen rule, so rules should be overriden by default rules

        // no enabled automatic zen rules and no default rules

        // so rules should be overriden by default rules

        mZenModeHelperSpy.mConfig.automaticRules = new ArrayMap<>();



        // set previous version
@@ -782,8 +783,8 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
    public void testReadXmlAllDisabledRulesResetDefaultRules() throws Exception {

        setupZenConfig();



        // all automatic zen rules are diabled on upgrade so rules should be overriden by default

        // rules

        // all automatic zen rules are diabled on upgrade (and default rules don't already exist)

        // so rules should be overriden by default rules

        ArrayMap<String, ZenModeConfig.ZenRule> enabledAutoRule = new ArrayMap<>();

        ZenModeConfig.ZenRule customRule = new ZenModeConfig.ZenRule();

        final ScheduleInfo weeknights = new ScheduleInfo();
@@ -813,6 +814,108 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        setupZenConfigMaintained();

    }



    @Test

    public void testReadXmlOnlyOneDefaultRuleExists() throws Exception {

        setupZenConfig();



        // all automatic zen rules are disabled on upgrade and only one default rule exists

        // so rules should be overriden to the default rules

        ArrayMap<String, ZenModeConfig.ZenRule> automaticRules = new ArrayMap<>();

        ZenModeConfig.ZenRule customRule = new ZenModeConfig.ZenRule();

        final ScheduleInfo customRuleInfo = new ScheduleInfo();

        customRule.enabled = false;

        customRule.name = "Custom Rule";

        customRule.zenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        customRule.conditionId = ZenModeConfig.toScheduleConditionId(customRuleInfo);

        automaticRules.put("customRule", customRule);



        ZenModeConfig.ZenRule defaultScheduleRule = new ZenModeConfig.ZenRule();

        final ScheduleInfo defaultScheduleRuleInfo = new ScheduleInfo();

        defaultScheduleRule.enabled = false;

        defaultScheduleRule.name = "Default Schedule Rule";

        defaultScheduleRule.zenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        defaultScheduleRule.conditionId = ZenModeConfig.toScheduleConditionId(

                defaultScheduleRuleInfo);

        defaultScheduleRule.id = ZenModeConfig.EVERY_NIGHT_DEFAULT_RULE_ID;

        automaticRules.put(ZenModeConfig.EVERY_NIGHT_DEFAULT_RULE_ID, defaultScheduleRule);



        mZenModeHelperSpy.mConfig.automaticRules = automaticRules;



        // set previous version

        ByteArrayOutputStream baos = writeXmlAndPurge(false, 5);

        XmlPullParser parser = Xml.newPullParser();

        parser.setInput(new BufferedInputStream(

                new ByteArrayInputStream(baos.toByteArray())), null);

        parser.nextTag();

        mZenModeHelperSpy.readXml(parser, false);



        // check default rules

        ArrayMap<String, ZenModeConfig.ZenRule> rules = mZenModeHelperSpy.mConfig.automaticRules;

        assertTrue(rules.size() != 0);

        for (String defaultId : ZenModeConfig.DEFAULT_RULE_IDS) {

            assertTrue(rules.containsKey(defaultId));

        }

        assertFalse(rules.containsKey("customRule"));



        setupZenConfigMaintained();

    }





    @Test

    public void testReadXmlDefaultRulesExist() throws Exception {

        setupZenConfig();



        // Default rules exist so rules should not be overridden by defaults

        ArrayMap<String, ZenModeConfig.ZenRule> automaticRules = new ArrayMap<>();

        ZenModeConfig.ZenRule customRule = new ZenModeConfig.ZenRule();

        final ScheduleInfo customRuleInfo = new ScheduleInfo();

        customRule.enabled = false;

        customRule.name = "Custom Rule";

        customRule.zenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        customRule.conditionId = ZenModeConfig.toScheduleConditionId(customRuleInfo);

        automaticRules.put("customRule", customRule);



        ZenModeConfig.ZenRule defaultScheduleRule = new ZenModeConfig.ZenRule();

        final ScheduleInfo defaultScheduleRuleInfo = new ScheduleInfo();

        defaultScheduleRule.enabled = false;

        defaultScheduleRule.name = "Default Schedule Rule";

        defaultScheduleRule.zenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        defaultScheduleRule.conditionId = ZenModeConfig.toScheduleConditionId(

                defaultScheduleRuleInfo);

        defaultScheduleRule.id = ZenModeConfig.EVERY_NIGHT_DEFAULT_RULE_ID;

        automaticRules.put(ZenModeConfig.EVERY_NIGHT_DEFAULT_RULE_ID, defaultScheduleRule);



        ZenModeConfig.ZenRule defaultEventRule = new ZenModeConfig.ZenRule();

        final ScheduleInfo defaultEventRuleInfo = new ScheduleInfo();

        defaultEventRule.enabled = false;

        defaultEventRule.name = "Default Event Rule";

        defaultEventRule.zenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        defaultEventRule.conditionId = ZenModeConfig.toScheduleConditionId(

                defaultEventRuleInfo);

        defaultEventRule.id = ZenModeConfig.EVENTS_DEFAULT_RULE_ID;

        automaticRules.put(ZenModeConfig.EVENTS_DEFAULT_RULE_ID, defaultEventRule);



        mZenModeHelperSpy.mConfig.automaticRules = automaticRules;



        // set previous version

        ByteArrayOutputStream baos = writeXmlAndPurge(false, 5);

        XmlPullParser parser = Xml.newPullParser();

        parser.setInput(new BufferedInputStream(

                new ByteArrayInputStream(baos.toByteArray())), null);

        parser.nextTag();

        mZenModeHelperSpy.readXml(parser, false);



        // check default rules

        ArrayMap<String, ZenModeConfig.ZenRule> rules = mZenModeHelperSpy.mConfig.automaticRules;

        assertTrue(rules.size() != 0);

        for (String defaultId : ZenModeConfig.DEFAULT_RULE_IDS) {

            assertTrue(rules.containsKey(defaultId));

        }

        assertTrue(rules.containsKey("customRule"));



        setupZenConfigMaintained();

    }



    private void setupZenConfig() {

        mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        mZenModeHelperSpy.mConfig.allowAlarms = false;