am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev

* commit '11f4cb1bccf47a0e985be6948f30709ba40f4522':
  decide interruptions based on current data, not previous data.
This commit is contained in:
Chris Wren
2015-07-27 13:21:39 +00:00
committed by Android Git Automerger

View File

@@ -1837,7 +1837,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;
@@ -2009,7 +2009,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.");