commit 749cd526649864f436b5859e8fee898eb0524dff
author Julia Reynolds <juliacr@google.com> Wed Mar 25 12:59:05 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 25 12:59:05 2020 +0000
tree 643a084b53ca661828b182a73c5e4c7a3ccba7d8
parent d91b3319e54614ca8253253fe087348896870b2d
parent 62f0d6d87b557ebbac4b965813d45327fe62f5de

Merge "Make sure the right DND config is used"

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 ebc4191..0e3268b 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -844,13 +844,13 @@
             final boolean policyChanged = !Objects.equals(getNotificationPolicy(mConfig),
                     getNotificationPolicy(config));
             if (!config.equals(mConfig)) {
+                mConfig = config;
                 dispatchOnConfigChanged();
                 updateConsolidatedPolicy(reason);
             }
             if (policyChanged) {
                 dispatchOnPolicyChanged();
             }
-            mConfig = config;
             mHandler.postApplyConfig(config, reason, triggeringComponent, setRingerMode);
             return true;
         } catch (SecurityException e) {