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

Author: cwren

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

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