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

Merge "Fix InvalidProtoWireException" into sc-dev am: 19943bde4b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14431464

Change-Id: I974a5acd93654d8ec553b116362c9de3fe41e252
This commit is contained in:
Jeffrey Huang
2021-05-05 21:33:50 +00:00
committed by Automerger Merge Worker
parent fdee330d80 19943bde4b
commit da2fca4c41
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);
}
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.dumpDebug(proto, ZenModeProto.ENABLED_ACTIVE_CONDITIONS);
}