From 2f9dbbaee7d9add7656614d8cff387561ba859ba Mon Sep 17 00:00:00 2001 From: Christoph Studer Date: Wed, 3 Sep 2014 17:35:54 +0200 Subject: [PATCH] SysUI: Suppress HUNs from non-profile users Bug: 17364652 Change-Id: Ic7a971d64cecc1624b872c776efeaccd09144db7 --- .../src/com/android/systemui/statusbar/BaseStatusBar.java | 7 +++++++ .../com/android/systemui/statusbar/NotificationData.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 37bc7c0519a67..dcd89ee303920 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -1904,6 +1904,13 @@ public abstract class BaseStatusBar extends SystemUI implements } protected boolean shouldInterrupt(StatusBarNotification sbn) { + if (mNotificationData.shouldFilterOut(sbn)) { + if (DEBUG) { + Log.d(TAG, "Skipping HUN check for " + sbn.getKey() + " since it's filtered out."); + } + return false; + } + Notification notification = sbn.getNotification(); // some predicates to make the boolean logic legible boolean isNoisy = (notification.defaults & Notification.DEFAULT_SOUND) != 0 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java index 454041c8450a7..cef889ce4df32 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java @@ -221,7 +221,7 @@ public class NotificationData { return mGroupsWithSummaries.contains(groupKey); } - private boolean shouldFilterOut(StatusBarNotification sbn) { + boolean shouldFilterOut(StatusBarNotification sbn) { if (!(mEnvironment.isDeviceProvisioned() || showNotificationEvenIfUnprovisioned(sbn))) { return true;