Merge "Zen: tweak audience interruption logic." into lmp-dev (e64b75ec) · Commits · e / os / android_frameworks_base

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

+10 −7

Original line number	Diff line number	Diff line
		@@ -169,24 +169,19 @@ public class ZenModeHelper {
		return false;
		}
		}
		// audience has veto power over all following rules
		if (!audienceMatches(record)) {
		ZenLog.traceIntercepted(record, "!audienceMatches");
		return true;
		}
		if (isCall(record)) {
		if (!mConfig.allowCalls) {
		ZenLog.traceIntercepted(record, "!allowCalls");
		return true;
		}
		return false;
		return shouldInterceptAudience(record);
		}
		if (isMessage(record)) {
		if (!mConfig.allowMessages) {
		ZenLog.traceIntercepted(record, "!allowMessages");
		return true;
		}
		return false;
		return shouldInterceptAudience(record);
		}
		ZenLog.traceIntercepted(record, "!allowed");
		return true;
		@@ -194,6 +189,14 @@ public class ZenModeHelper {
		return false;
		}

		private boolean shouldInterceptAudience(NotificationRecord record) {
		if (!audienceMatches(record)) {
		ZenLog.traceIntercepted(record, "!audienceMatches");
		return true;
		}
		return false;
		}

		public int getZenMode() {
		return mZenMode;
		}