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

Allow updates to DND configuration activities

Browse Source 
Package name needs to be frozen but the config activity doesn't
need to be

Test: NotificationManagerTest and test app that updates the config activity
(DND can still be enabled and disabled and the links from settings worked)
Fixes: 184191272

Change-Id: I1dd98e01ce0738dd176d0603dd07a3c3816f9f1a
This commit is contained in:
Julia Reynolds
2021-04-07 11:08:04 -04:00
parent 997917d403
commit b7ef42dc95
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) {