diff options
| -rw-r--r-- | services/core/java/com/android/server/notification/ZenModeHelper.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index b7b5f98..758f334 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -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; } |