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

Commit 6f4316a8 authored by Christoph Studer's avatar Christoph Studer Committed by Android Git Automerger
Browse files

am 06a6416a: am 63cb39a3: Merge "NoMan: Fix speedbump when no low-prio notifs" into lmp-dev 

* commit '06a6416a29bb98ffdb44d12a28a33956d0b1bb02':
  NoMan: Fix speedbump when no low-prio notifs
parents 4692edac 5f4eebd1

core/java/android/service/notification/NotificationListenerService.java

+5 −1
Original line number Diff line number Diff line
@@ -609,8 +609,12 @@ public abstract class NotificationListenerService extends Service { 
        }



        private boolean isAmbient(String key) {

            int firstAmbientIndex = mRankingUpdate.getFirstAmbientIndex();

            if (firstAmbientIndex < 0) {

                return false;

            }

            int rank = getRank(key);

            return rank >= 0 && rank >= mRankingUpdate.getFirstAmbientIndex();

            return rank >= 0 && rank >= firstAmbientIndex;

        }



        private boolean isIntercepted(String key) {

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

+1 −2
Original line number Diff line number Diff line
@@ -1422,8 +1422,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
    }



    private boolean shouldShowOnKeyguard(StatusBarNotification sbn) {

        return mShowLockscreenNotifications &&

                sbn.getNotification().priority >= Notification.PRIORITY_LOW;

        return mShowLockscreenNotifications && !mNotificationData.isAmbient(sbn.getKey());

    }



    protected void setZenMode(int mode) {