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

Merge "Allow updates to DND configuration activities" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-07 16:49:45 +00:00
committed by Android (Google) Code Review
parent db96662e30 b7ef42dc95
commit 3526c99cec
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -586,19 +586,6 @@ public class ZenModeHelper {
}
private void populateZenRule(AutomaticZenRule automaticZenRule, ZenRule rule, boolean isNew) {
if (isNew) {
rule.id = ZenModeConfig.newRuleId();
rule.creationTime = System.currentTimeMillis();
rule.component = automaticZenRule.getOwner();
rule.configurationActivity = automaticZenRule.getConfigurationActivity();
rule.pkg = (rule.component != null)
? rule.component.getPackageName()
: rule.configurationActivity.getPackageName();
}
if (rule.enabled != automaticZenRule.isEnabled()) {
rule.snoozing = false;
}
rule.name = automaticZenRule.getName();
rule.condition = null;
rule.conditionId = automaticZenRule.getConditionId();
@@ -607,6 +594,20 @@ public class ZenModeHelper {
rule.zenPolicy = automaticZenRule.getZenPolicy();
rule.zenMode = NotificationManager.zenModeFromInterruptionFilter(
automaticZenRule.getInterruptionFilter(), Global.ZEN_MODE_OFF);
rule.configurationActivity = automaticZenRule.getConfigurationActivity();
if (isNew) {
rule.id = ZenModeConfig.newRuleId();
rule.creationTime = System.currentTimeMillis();
rule.component = automaticZenRule.getOwner();
rule.pkg = (rule.component != null)
? rule.component.getPackageName()
: rule.configurationActivity.getPackageName();
}
if (rule.enabled != automaticZenRule.isEnabled()) {
rule.snoozing = false;
}
}
protected AutomaticZenRule createAutomaticZenRule(ZenRule rule) {