Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev (6db58cb0) · Commits · e / os / android_frameworks_base

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -1783,7 +1783,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		oldEntry.notification.getNotification().tickerText);

		final boolean shouldInterrupt = shouldInterrupt(notification);
		final boolean alertAgain = alertAgain(oldEntry);
		final boolean alertAgain = alertAgain(oldEntry, n);
		boolean updateSuccessful = false;
		if (contentsUnchanged && bigContentsUnchanged && headsUpContentsUnchanged
		&& publicUnchanged) {
		@@ -1947,10 +1947,9 @@ public abstract class BaseStatusBar extends SystemUI implements
		}
		}

		private boolean alertAgain(Entry entry) {
		final StatusBarNotification sbn = entry.notification;
		return entry == null \|\| !entry.hasInterrupted()
		\|\| (sbn.getNotification().flags & Notification.FLAG_ONLY_ALERT_ONCE) == 0;
		private boolean alertAgain(Entry oldEntry, Notification newNotification) {
		return oldEntry == null \|\| !oldEntry.hasInterrupted()
		\|\| (newNotification.flags & Notification.FLAG_ONLY_ALERT_ONCE) == 0;
		}

		protected boolean shouldInterrupt(StatusBarNotification sbn) {