mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-26 14:42:13 +00:00
202033c013
This adds 3 expat patches for n-asb-2022-09 from https://github.com/syphyr/android_external_expat/commits/cm-14.1 and also applies 2 of them to 15.1 Signed-off-by: Tad <tad@spotco.us>
41 lines
2.0 KiB
Diff
41 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Julia Reynolds <juliacr@google.com>
|
|
Date: Tue, 1 Mar 2022 10:30:27 -0500
|
|
Subject: [PATCH] DO NOT MERGE Add an OEM configurable limit for zen rules
|
|
|
|
Test: ZenModeHelperTest
|
|
Bug: 220735360
|
|
Change-Id: I3da105951af90007bf48dc6cf00aed3e28778b36
|
|
Merged-In: I3da105951af90007bf48dc6cf00aed3e28778b36
|
|
(cherry picked from commit 3072d98c2dc2b709bd8ffc343c101557a53dd188)
|
|
Merged-In: I3da105951af90007bf48dc6cf00aed3e28778b36
|
|
---
|
|
.../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 c2d70c070ad4..eb883b486b09 100644
|
|
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
|
|
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
|
|
@@ -85,6 +85,7 @@ public class ZenModeHelper {
|
|
|
|
// The amount of time rules instances can exist without their owning app being installed.
|
|
private static final int RULE_INSTANCE_GRACE_PERIOD = 1000 * 60 * 60 * 72;
|
|
+ static final int RULE_LIMIT_PER_PACKAGE = 100;
|
|
|
|
private final Context mContext;
|
|
private final H mHandler;
|
|
@@ -294,8 +295,10 @@ public class ZenModeHelper {
|
|
ruleInstanceLimit = owner.metaData.getInt(
|
|
ConditionProviderService.META_DATA_RULE_INSTANCE_LIMIT, -1);
|
|
}
|
|
- if (ruleInstanceLimit > 0 && ruleInstanceLimit
|
|
- < (getCurrentInstanceCount(automaticZenRule.getOwner()) + 1)) {
|
|
+ int newRuleInstanceCount = getCurrentInstanceCount(automaticZenRule.getOwner())
|
|
+ + 1;
|
|
+ if (newRuleInstanceCount > RULE_LIMIT_PER_PACKAGE
|
|
+ || (ruleInstanceLimit > 0 && ruleInstanceLimit < newRuleInstanceCount)) {
|
|
throw new IllegalArgumentException("Rule instance limit exceeded");
|
|
}
|
|
}
|