commit 8363944f8affef2d3c23977cb09499e2dd36e5eb
author Beverly <beverlyt@google.com> Wed Sep 06 10:36:04 2017 -0400
committer Beverly <beverlyt@google.com> Wed Sep 06 10:50:22 2017 -0400
tree 40d9fe37c1ae5767e9d2f8c07a76eb49118fbeec
parent 563a5637d71db27e0fc95082601198e29d80a15e

Ensures zen rule update locale retains enabled val

Bug: 65344958
Test: manual
Change-Id: I7c929b0398fce61cbf7aaa7b7b491a489422af5f

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

diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 1a0b878..3194c52 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -465,6 +465,8 @@
                             + "from " + currRule.getName() + " to " + defaultRule.name);
                     // update default rule (if locale changed, name of rule will change)
                     AutomaticZenRule defaultAutoRule = createAutomaticZenRule(defaultRule);
+                    // ensure enabled state is carried over from current rule
+                    defaultAutoRule.setEnabled(currRule.isEnabled());
                     updateAutomaticZenRule(ruleId, defaultAutoRule,
                             "locale changed");
                 }