Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d93d5adf authored by Chris Wren's avatar Chris Wren
Browse files

Bring consistency to FLAG_ONLY_ALERT_ONCE semantics. 

For updates, the sounds layer checks for existence of the flag on the
new version while the heads up was checking for the flag on the
old version.

Both now agree to check the new version.

Bug: 14255617
Change-Id: Ib617df11f0dea17b5dfdf2ef6330bdbd18032ac6
parent 6a28a8d5

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

+4 −5
Original line number Diff line number Diff line
@@ -1776,7 +1776,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) {
@@ -1940,10 +1940,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) {