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

Merge "Fix InvalidProtoWireException" into sc-dev

Browse Source
This commit is contained in:
Jeffrey Huang
2021-05-05 21:18:57 +00:00
committed by Android (Google) Code Review
parent 48a3676a12 dd4f6314cc
commit 19943bde4b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -659,7 +659,8 @@ public class ZenModeHelper {
mConfig.manualRule.dumpDebug(proto, ZenModeProto.ENABLED_ACTIVE_CONDITIONS); mConfig.manualRule.dumpDebug(proto, ZenModeProto.ENABLED_ACTIVE_CONDITIONS);
} }
for (ZenRule rule : mConfig.automaticRules.values()) { for (ZenRule rule : mConfig.automaticRules.values()) {
if (rule.enabled && rule.condition.state == Condition.STATE_TRUE if (rule.enabled && rule.condition != null
&& rule.condition.state == Condition.STATE_TRUE
&& !rule.snoozing) { && !rule.snoozing) {
rule.dumpDebug(proto, ZenModeProto.ENABLED_ACTIVE_CONDITIONS); rule.dumpDebug(proto, ZenModeProto.ENABLED_ACTIVE_CONDITIONS);
} }