From 0dbb7310088fdf2845861d2dc0e271812083e273 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Thu, 3 Mar 2016 15:10:21 -0500 Subject: [PATCH] Only noisy notifications can be bumped for intrusiveness. Bug: 27431139 Change-Id: I5a1d2e2ac33bb9db04df2b6eea7d0baec2552c36 --- .../notification/NotificationIntrusivenessExtractor.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/notification/NotificationIntrusivenessExtractor.java b/services/core/java/com/android/server/notification/NotificationIntrusivenessExtractor.java index b57cc75ebf13..bcdeb666987f 100644 --- a/services/core/java/com/android/server/notification/NotificationIntrusivenessExtractor.java +++ b/services/core/java/com/android/server/notification/NotificationIntrusivenessExtractor.java @@ -23,7 +23,7 @@ import android.util.Log; import android.util.Slog; /** - * This {@link com.android.server.notification.NotificationSignalExtractor} noticies noisy + * This {@link com.android.server.notification.NotificationSignalExtractor} notices noisy * notifications and marks them to get a temporary ranking bump. */ public class NotificationIntrusivenessExtractor implements NotificationSignalExtractor { @@ -44,9 +44,15 @@ public class NotificationIntrusivenessExtractor implements NotificationSignalExt return null; } - final Notification notification = record.getNotification(); - if (record.getImportance() > NotificationListenerService.Ranking.IMPORTANCE_DEFAULT) { - record.setRecentlyIntrusive(true); + if (record.getImportance() >= NotificationListenerService.Ranking.IMPORTANCE_DEFAULT) { + final Notification notification = record.getNotification(); + if ((notification.defaults & Notification.DEFAULT_VIBRATE) != 0 || + notification.vibrate != null || + (notification.defaults & Notification.DEFAULT_SOUND) != 0 || + notification.sound != null || + notification.fullScreenIntent != null) { + record.setRecentlyIntrusive(true); + } } return new RankingReconsideration(record.getKey(), HANG_TIME_MS) { -- 2.11.0