From 0c274b107ca5211bdaf06c4144b5b30eca1486bf Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Fri, 17 Jul 2015 10:34:53 -0400 Subject: [PATCH] decide interruptions based on current data, not previous data. shouldInterrupt() now takes an optional StatusBarNotification object that will be used instead of the one on the entry. Bug:22462619 Change-Id: I5a1d9205b22ad733d5bc582693edad26518e1959 --- .../src/com/android/systemui/statusbar/BaseStatusBar.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index f62dc5981e41c..9d5b19d079a55 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -1833,7 +1833,7 @@ public abstract class BaseStatusBar extends SystemUI implements logUpdate(entry, n); } boolean applyInPlace = shouldApplyInPlace(entry, n); - boolean shouldInterrupt = shouldInterrupt(entry); + boolean shouldInterrupt = shouldInterrupt(entry, notification); boolean alertAgain = alertAgain(entry, n); entry.notification = notification; @@ -2005,7 +2005,10 @@ public abstract class BaseStatusBar extends SystemUI implements } protected boolean shouldInterrupt(Entry entry) { - StatusBarNotification sbn = entry.notification; + return shouldInterrupt(entry, entry.notification); + } + + protected boolean shouldInterrupt(Entry entry, StatusBarNotification sbn) { if (mNotificationData.shouldFilterOut(sbn)) { if (DEBUG) { Log.d(TAG, "Skipping HUN check for " + sbn.getKey() + " since it's filtered out.");