Merge "CATEGORY_SYSTEM should not bypass dnd" (505e2004) · Commits · e / os / android_frameworks_base

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -104,9 +104,6 @@ public class ZenModeFiltering {
		}

		public boolean shouldIntercept(int zen, ZenModeConfig config, NotificationRecord record) {
		if (isSystem(record)) {
		return false;
		}
		switch (zen) {
		case Global.ZEN_MODE_NO_INTERRUPTIONS:
		// #notevenalarms
		@@ -177,10 +174,6 @@ public class ZenModeFiltering {
		return false;
		}

		private static boolean isSystem(NotificationRecord record) {
		return record.isCategory(Notification.CATEGORY_SYSTEM);
		}

		private static boolean isAlarm(NotificationRecord record) {
		return record.isCategory(Notification.CATEGORY_ALARM)
		\|\| record.isAudioStream(AudioManager.STREAM_ALARM)