am cd98a559: am c909e1b2: Zen: Fix new event category check. (394f29e7) · Commits · e / os / android_frameworks_base

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

+35 −33

Original line number	Diff line number	Diff line
		@@ -150,24 +150,24 @@ public class ZenModeHelper {
		}

		public boolean shouldIntercept(NotificationRecord record) {
		if (mZenMode != Global.ZEN_MODE_OFF) {
		if (isSystem(record)) {
		return false;
		}
		if (isAlarm(record)) {
		if (mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS) {
		ZenLog.traceIntercepted(record, "alarm");
		switch (mZenMode) {
		case Global.ZEN_MODE_NO_INTERRUPTIONS:
		// #notevenalarms
		ZenLog.traceIntercepted(record, "none");
		return true;
		}
		case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
		if (isAlarm(record)) {
		// Alarms are always priority
		return false;
		}
		// allow user-prioritized packages through in priority mode
		if (mZenMode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS) {
		if (record.getPackagePriority() == Notification.PRIORITY_MAX) {
		ZenLog.traceNotIntercepted(record, "priorityApp");
		return false;
		}
		}
		if (isCall(record)) {
		if (!mConfig.allowCalls) {
		ZenLog.traceIntercepted(record, "!allowCalls");
		@@ -187,12 +187,14 @@ public class ZenModeHelper {
		ZenLog.traceIntercepted(record, "!allowEvents");
		return true;
		}
		return false;
		}
		ZenLog.traceIntercepted(record, "!allowed");
		ZenLog.traceIntercepted(record, "!priority");
		return true;
		}
		default:
		return false;
		}
		}

		private boolean shouldInterceptAudience(NotificationRecord record) {
		if (!audienceMatches(record.getContactAffinity())) {