Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Zen: tweak audience interruption logic." into lmp-dev

Browse Source
This commit is contained in:
John Spurlock
2014-08-15 18:16:13 +00:00
committed by Android (Google) Code Review
parent 09f6e61489 528dcd2fbe
commit e64b75ecd3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -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;
}