From 7f2f441783c3924637998f3692439722c423f199 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Tue, 1 Mar 2016 12:33:48 -0500 Subject: [PATCH] Protect against a lack of metadata. Change-Id: Idc28ac451567e8ee4772d9db3009102d781e6331 --- .../core/java/com/android/server/notification/ZenModeHelper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index ed439c937fee..5c5c8f854105 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -271,8 +271,11 @@ public class ZenModeHelper { throw new IllegalArgumentException("Owner is not a condition provider service"); } - final int ruleInstanceLimit = owner.metaData.getInt( - ConditionProviderService.META_DATA_RULE_INSTANCE_LIMIT, -1); + int ruleInstanceLimit = -1; + if (owner.metaData != null) { + ruleInstanceLimit = owner.metaData.getInt( + ConditionProviderService.META_DATA_RULE_INSTANCE_LIMIT, -1); + } if (ruleInstanceLimit > 0 && ruleInstanceLimit < (getCurrentInstanceCount(automaticZenRule.getOwner()) + 1)) { throw new IllegalArgumentException("Rule instance limit exceeded"); -- 2.11.0