Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da2fca4c authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I974a5acd93654d8ec553b116362c9de3fe41e252
parents fdee330d 19943bde

services/core/java/com/android/server/notification/ZenModeHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

                }