Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure the right DND config is used" am: 749cd52664

Browse Source 
Change-Id: Iaa07c8884f21e4fc50a8a54d4b28e60e8dde66ba
This commit is contained in:
Julia Reynolds
2020-03-25 13:12:09 +00:00
committed by Automerger Merge Worker
parent 3eea7b199e 749cd52664
commit 4e7a5bf7db
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/notification/ZenModeHelper.java
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) {