diff options
| author | Chris Wren <cwren@android.com> | 2014-09-08 20:47:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-08 20:47:07 +0000 |
| commit | 6db58cb0a19dd40cab5de5bcb55994281c0e925a (patch) | |
| tree | 626aa7ef65569d4577bb57958452f0ab24b5e3d4 /packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | |
| parent | d9037a48c6a3537b90c72fce9845fae182be62db (diff) | |
| parent | d93d5adfe72d7f9785a595457ef7049737b0f526 (diff) | |
| download | frameworks_base-6db58cb0a19dd40cab5de5bcb55994281c0e925a.zip frameworks_base-6db58cb0a19dd40cab5de5bcb55994281c0e925a.tar.gz frameworks_base-6db58cb0a19dd40cab5de5bcb55994281c0e925a.tar.bz2 | |
Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 4dabe0d..f4587db 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -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) { |