From 62f0d6d87b557ebbac4b965813d45327fe62f5de Mon Sep 17 00:00:00 2001
From: Daniel Hunt <daniel.hunt@sonymobile.com>
Date: Fri, 6 Mar 2020 13:43:24 +0100
Subject: [PATCH] Make sure the right DND config is used

The notifications are sometimes updated before the new
reminder policy is set and are incorrectly shown/hidden
in the statusbar and notification panel.

Bug: 152070118
Test: Manual - See bug details
Change-Id: I3352cdd71538dd9f1333b6e737690e39dd713ee4
---
 .../java/com/android/server/notification/ZenModeHelper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index ebc41916d034e..0e3268b8b9f29 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 @@ public class ZenModeHelper {
             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) {