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

Merge "Check zen modes+manual rule for in consol zen pol" into qt-dev

Browse Source 
am: aac2e8c687

Change-Id: I83a4324c0baba01e7ab6582d3a02afcfe5c0db9c
This commit is contained in:
Beverly Tai
2019-04-19 06:26:33 -07:00
committed by android-build-merger
parent b9d4d6a9fb aac2e8c687
commit 81e154f363
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -940,13 +940,34 @@ public class ZenModeHelper {
}
}
private void applyCustomPolicy(ZenPolicy policy, ZenRule rule) {
if (rule.zenMode == NotificationManager.INTERRUPTION_FILTER_NONE) {
policy.apply(new ZenPolicy.Builder()
.disallowAllSounds()
.build());
} else if (rule.zenMode
== NotificationManager.INTERRUPTION_FILTER_ALARMS) {
policy.apply(new ZenPolicy.Builder()
.disallowAllSounds()
.allowAlarms(true)
.allowMedia(true)
.build());
} else {
policy.apply(rule.zenPolicy);
}
}
private void updateConsolidatedPolicy(String reason) {
if (mConfig == null) return;
synchronized (mConfig) {
ZenPolicy policy = new ZenPolicy();
if (mConfig.manualRule != null) {
applyCustomPolicy(policy, mConfig.manualRule);
}
for (ZenRule automaticRule : mConfig.automaticRules.values()) {
if (automaticRule.isAutomaticActive()) {
policy.apply(automaticRule.zenPolicy);
applyCustomPolicy(policy, automaticRule);
}
}
Policy newPolicy = mConfig.toNotificationPolicy(policy);