Merge "Prevent creation of default channel." (7b0a7223) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -507,6 +507,9 @@ public class RankingHelper implements RankingConfig {
		if (channel.getGroup() != null && !r.groups.containsKey(channel.getGroup())) {
		throw new IllegalArgumentException("NotificationChannelGroup doesn't exist");
		}
		if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(channel.getId())) {
		throw new IllegalArgumentException("Reserved id");
		}

		NotificationChannel existing = r.channels.get(channel.getId());
		// Keep existing settings

+12 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package com.android.server.notification;

		import static android.app.NotificationManager.IMPORTANCE_HIGH;
		import static android.app.NotificationManager.IMPORTANCE_LOW;

		import static junit.framework.Assert.assertNull;
		@@ -770,6 +771,17 @@ public class RankingHelperTest {
		mHelper.getNotificationChannel(pkg, uid, newChannel.getId(), false));
		}

		@Test
		public void testCreateChannel_defaultChannelId() throws Exception {
		try {
		mHelper.createNotificationChannel(pkg2, uid2, new NotificationChannel(
		NotificationChannel.DEFAULT_CHANNEL_ID, "ha", IMPORTANCE_HIGH), true);
		fail("Allowed to create default channel");
		} catch (IllegalArgumentException e) {
		// pass
		}
		}

		@Test
		public void testCreateChannel_alreadyExists() throws Exception {
		long[] vibration = new long[]{100, 67, 145, 156};