diff options
| -rw-r--r-- | core/java/android/service/notification/NotificationListenerService.java | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index 1f01bc843b29..f807ad655ca5 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -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) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 03508eaa4a80..15a92861688c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -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) { |