mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
152 lines
7.3 KiB
Diff
152 lines
7.3 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
|
||
|
---
|
||
|
.../server/notification/ZenModeHelper.java | 6 ++-
|
||
|
.../notification/ZenModeHelperTest.java | 52 ++++++++++++++++++-
|
||
|
2 files changed, 55 insertions(+), 3 deletions(-)
|
||
|
|
||
|
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
|
||
|
index 0c42f8ab8345..90c7a874c2f4 100644
|
||
|
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
|
||
|
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
|
||
|
@@ -91,6 +91,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,9 @@ 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");
|
||
|
}
|
||
|
}
|
||
|
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java
|
||
|
index 8222c386c0d9..1d97b09853c3 100644
|
||
|
--- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java
|
||
|
+++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java
|
||
|
@@ -20,10 +20,13 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE;
|
||
|
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
|
||
|
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
|
||
|
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
|
||
|
+import static com.android.server.notification.ZenModeHelper.RULE_LIMIT_PER_PACKAGE;
|
||
|
|
||
|
import static junit.framework.Assert.assertFalse;
|
||
|
import static junit.framework.Assert.assertEquals;
|
||
|
+import static junit.framework.Assert.assertNotNull;
|
||
|
import static junit.framework.TestCase.assertTrue;
|
||
|
+import static junit.framework.TestCase.fail;
|
||
|
|
||
|
import static org.mockito.ArgumentMatchers.any;
|
||
|
import static org.mockito.ArgumentMatchers.anyBoolean;
|
||
|
@@ -44,6 +47,9 @@ import android.app.NotificationManager;
|
||
|
import android.content.ComponentName;
|
||
|
import android.content.ContentResolver;
|
||
|
import android.content.Context;
|
||
|
+import android.content.pm.ActivityInfo;
|
||
|
+import android.content.pm.PackageManager;
|
||
|
+import android.content.pm.ResolveInfo;
|
||
|
import android.content.res.Resources;
|
||
|
import android.media.AudioAttributes;
|
||
|
import android.media.AudioManager;
|
||
|
@@ -69,6 +75,8 @@ import com.android.internal.util.FastXmlSerializer;
|
||
|
import com.android.server.UiServiceTestCase;
|
||
|
import android.util.Slog;
|
||
|
|
||
|
+import com.google.common.collect.ImmutableList;
|
||
|
+
|
||
|
import org.junit.Before;
|
||
|
import org.junit.Test;
|
||
|
import org.junit.runner.RunWith;
|
||
|
@@ -87,8 +95,12 @@ import java.io.ByteArrayOutputStream;
|
||
|
@TestableLooper.RunWithLooper
|
||
|
public class ZenModeHelperTest extends UiServiceTestCase {
|
||
|
|
||
|
+ private static final String CUSTOM_PKG_NAME = "not.android";
|
||
|
+ private static final int CUSTOM_PKG_UID = 1;
|
||
|
+
|
||
|
ConditionProviders mConditionProviders;
|
||
|
@Mock NotificationManager mNotificationManager;
|
||
|
+ @Mock PackageManager mPackageManager;
|
||
|
@Mock private Resources mResources;
|
||
|
private TestableLooper mTestableLooper;
|
||
|
private ZenModeHelper mZenModeHelperSpy;
|
||
|
@@ -96,7 +108,7 @@ public class ZenModeHelperTest extends UiServiceTestCase {
|
||
|
private ContentResolver mContentResolver;
|
||
|
|
||
|
@Before
|
||
|
- public void setUp() {
|
||
|
+ public void setUp() throws PackageManager.NameNotFoundException {
|
||
|
MockitoAnnotations.initMocks(this);
|
||
|
|
||
|
mTestableLooper = TestableLooper.get(this);
|
||
|
@@ -112,6 +124,16 @@ public class ZenModeHelperTest extends UiServiceTestCase {
|
||
|
mConditionProviders.addSystemProvider(new CountdownConditionProvider());
|
||
|
mZenModeHelperSpy = spy(new ZenModeHelper(mContext, mTestableLooper.getLooper(),
|
||
|
mConditionProviders));
|
||
|
+
|
||
|
+ ResolveInfo ri = new ResolveInfo();
|
||
|
+ ri.activityInfo = new ActivityInfo();
|
||
|
+ when(mPackageManager.queryIntentActivitiesAsUser(any(), anyInt(), anyInt())).thenReturn(
|
||
|
+ ImmutableList.of(ri));
|
||
|
+ when(mPackageManager.getPackageUidAsUser(eq(CUSTOM_PKG_NAME), anyInt()))
|
||
|
+ .thenReturn(CUSTOM_PKG_UID);
|
||
|
+ when(mPackageManager.getPackagesForUid(anyInt())).thenReturn(
|
||
|
+ new String[] {getContext().getPackageName()});
|
||
|
+ mZenModeHelperSpy.mPm = mPackageManager;
|
||
|
}
|
||
|
|
||
|
private ByteArrayOutputStream writeXmlAndPurge(boolean forBackup, Integer version)
|
||
|
@@ -844,6 +866,34 @@ public class ZenModeHelperTest extends UiServiceTestCase {
|
||
|
assertEquals(1, mZenModeHelperSpy.mConditions.mSubscriptions.size());
|
||
|
}
|
||
|
|
||
|
+ @Test
|
||
|
+ public void testAddAutomaticZenRule_beyondSystemLimit() {
|
||
|
+ for (int i = 0; i < RULE_LIMIT_PER_PACKAGE; i++) {
|
||
|
+ ScheduleInfo si = new ScheduleInfo();
|
||
|
+ si.startHour = i;
|
||
|
+ AutomaticZenRule zenRule = new AutomaticZenRule("name" + i,
|
||
|
+ null,
|
||
|
+ new ComponentName("android", "ScheduleConditionProvider"),
|
||
|
+ ZenModeConfig.toScheduleConditionId(si),
|
||
|
+ new ZenPolicy.Builder().build(),
|
||
|
+ NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
|
||
|
+ String id = mZenModeHelperSpy.addAutomaticZenRule(zenRule, "test");
|
||
|
+ assertNotNull(id);
|
||
|
+ }
|
||
|
+ try {
|
||
|
+ AutomaticZenRule zenRule = new AutomaticZenRule("name",
|
||
|
+ null,
|
||
|
+ new ComponentName("android", "ScheduleConditionProvider"),
|
||
|
+ ZenModeConfig.toScheduleConditionId(new ScheduleInfo()),
|
||
|
+ new ZenPolicy.Builder().build(),
|
||
|
+ NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
|
||
|
+ String id = mZenModeHelperSpy.addAutomaticZenRule(zenRule, "test");
|
||
|
+ fail("allowed too many rules to be created");
|
||
|
+ } catch (IllegalArgumentException e) {
|
||
|
+ // yay
|
||
|
+ }
|
||
|
+ }
|
||
|
+
|
||
|
private void setupZenConfig() {
|
||
|
mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
|
||
|
mZenModeHelperSpy.mConfig.allowAlarms = false;
|