Merge "Make sure the right DND config is used"

This commit is contained in:
Julia Reynolds
2020-03-25 12:59:05 +00:00
committed by Gerrit Code Review

View File

@@ -844,13 +844,13 @@ public class ZenModeHelper {
final boolean policyChanged = !Objects.equals(getNotificationPolicy(mConfig), final boolean policyChanged = !Objects.equals(getNotificationPolicy(mConfig),
getNotificationPolicy(config)); getNotificationPolicy(config));
if (!config.equals(mConfig)) { if (!config.equals(mConfig)) {
mConfig = config;
dispatchOnConfigChanged(); dispatchOnConfigChanged();
updateConsolidatedPolicy(reason); updateConsolidatedPolicy(reason);
} }
if (policyChanged) { if (policyChanged) {
dispatchOnPolicyChanged(); dispatchOnPolicyChanged();
} }
mConfig = config;
mHandler.postApplyConfig(config, reason, triggeringComponent, setRingerMode); mHandler.postApplyConfig(config, reason, triggeringComponent, setRingerMode);
return true; return true;
} catch (SecurityException e) { } catch (SecurityException e) {