Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev (f1dc5b1e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/PreferencesHelper.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -589,6 +589,9 @@ public class PreferencesHelper implements RankingConfig {
		if (r == null) {
		throw new IllegalArgumentException("Invalid package");
		}
		if (fromTargetApp) {
		group.setBlocked(false);
		}
		final NotificationChannelGroup oldGroup = r.groups.get(group.getId());
		if (!group.equals(oldGroup)) {
		// will log for new entries as well as name/description changes

+13 −0

Original line number	Diff line number	Diff line
		@@ -2030,6 +2030,19 @@ public class PreferencesHelperTest extends UiServiceTestCase {
		assertTrue(mHelper.isGroupBlocked(PKG_N_MR1, UID_N_MR1, group.getId()));
		}

		@Test
		public void testIsGroupBlocked_appCannotCreateAsBlocked() throws Exception {
		NotificationChannelGroup group = new NotificationChannelGroup("id", "name");
		group.setBlocked(true);
		mHelper.createNotificationChannelGroup(PKG_N_MR1, UID_N_MR1, group, true);
		assertFalse(mHelper.isGroupBlocked(PKG_N_MR1, UID_N_MR1, group.getId()));

		NotificationChannelGroup group3 = group.clone();
		group3.setBlocked(false);
		mHelper.createNotificationChannelGroup(PKG_N_MR1, UID_N_MR1, group3, true);
		assertFalse(mHelper.isGroupBlocked(PKG_N_MR1, UID_N_MR1, group.getId()));
		}

		@Test
		public void testIsGroup_appCannotResetBlock() throws Exception {
		NotificationChannelGroup group = new NotificationChannelGroup("id", "name");