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

Browse Source
This commit is contained in:
Matías Hernández
2023-03-02 12:42:01 +00:00
committed by Android (Google) Code Review
parent 4bb03bd915 5d1aca0f91
commit 7e08f7c9f2
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -862,11 +862,11 @@ public class PreferencesHelper implements RankingConfig {
if (r == null) { if (r == null) {
throw new IllegalArgumentException("Invalid package"); throw new IllegalArgumentException("Invalid package");
} }
if (fromTargetApp) {
group.setBlocked(false);
if (r.groups.size() >= NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT) { if (r.groups.size() >= NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT) {
throw new IllegalStateException("Limit exceed; cannot create more groups"); throw new IllegalStateException("Limit exceed; cannot create more groups");
} }
if (fromTargetApp) {
group.setBlocked(false);
} }
final NotificationChannelGroup oldGroup = r.groups.get(group.getId()); final NotificationChannelGroup oldGroup = r.groups.get(group.getId());
if (oldGroup != null) { 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 @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++) { for (int i = 0; i < NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT; i++) {
NotificationChannelGroup group = new NotificationChannelGroup(String.valueOf(i), NotificationChannelGroup group = new NotificationChannelGroup(String.valueOf(i),
String.valueOf(i)); String.valueOf(i));
mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, true); mHelper.createNotificationChannelGroup(PKG_O, UID_O, group, fromTargetApp);
} }
try { try {
NotificationChannelGroup group = new NotificationChannelGroup( NotificationChannelGroup group = new NotificationChannelGroup(
String.valueOf(NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT), String.valueOf(NOTIFICATION_CHANNEL_GROUP_COUNT_LIMIT),
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"); fail("Allowed to create too many notification channel groups");
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
// great // great