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

Merge "Check channel group limit when creating from a NotificationListener" into udc-dev am: 7e08f7c9f2

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

Change-Id: I23f5d9c50967b950d2fb83f5566667d33821f9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matías Hernández
2023-03-02 12:53:37 +00:00
committed by Automerger Merge Worker
parent a70ac12e12 7e08f7c9f2
commit 0f7af38d29
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/notification/PreferencesHelper.java
View File

@@ -862,11 +862,11 @@ public class PreferencesHelper implements RankingConfig {
if (r == null) {
throw new IllegalArgumentException("Invalid package");
}
if (r.groups.size() >= NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT) {
throw new IllegalStateException("Limit exceed; cannot create more groups");
}
if (fromTargetApp) {
group.setBlocked(false);
if (r.groups.size() >= NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT) {
throw new IllegalStateException("Limit exceed; cannot create more groups");
}
}
final NotificationChannelGroup oldGroup = r.groups.get(group.getId());
if (oldGroup != null) {

15
services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java
View File

@@ -4131,17 +4131,26 @@ public class PreferencesHelperTest extends UiServiceTestCase {
}
@Test
public void testTooManyGroups() {
public void testTooManyGroups_fromTargetApp() {
testTooManyGroups(/* fromTargetApp= */ true);
}
@Test
public void testTooManyGroups_fromListener() {
testTooManyGroups(/* fromTargetApp= */ false);
}
private void testTooManyGroups(boolean fromTargetApp) {
for (int i = 0; i < NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT; i++) {
NotificationChannelGroup group = new NotificationChannelGroup(String.valueOf(i),
String.valueOf(i));
mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, true);
mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, fromTargetApp);
}
try {
NotificationChannelGroup group = new NotificationChannelGroup(
String.valueOf(NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT),
String.valueOf(NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT));
mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, true);
mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, fromTargetApp);
fail("Allowed to create too many notification channel groups");
} catch (IllegalStateException e) {
// great