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

Merge "Protect against a lack of metadata." into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-03-01 18:56:15 +00:00
committed by Android (Google) Code Review
parent 1c7cd0a882 7f2f441783
commit 9e65739c19
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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");