Skip to content

Commit

Permalink
am 11f4cb1: Merge "decide interruptions based on current data, not pr…
Browse files Browse the repository at this point in the history
…evious data." into mnc-dev

* commit '11f4cb1bccf47a0e985be6948f30709ba40f4522':
  decide interruptions based on current data, not previous data.
  • Loading branch information
cwren authored and Android Git Automerger committed Jul 27, 2015
2 parents 3dad6c6 + 11f4cb1 commit fdc283e
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1837,7 +1837,7 @@ public void updateNotification(StatusBarNotification notification, RankingMap ra
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;
Expand Down Expand Up @@ -2009,7 +2009,10 @@ private boolean alertAgain(Entry oldEntry, Notification newNotification) {
}

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.");
Expand Down

0 comments on commit fdc283e

Please sign in to comment.