commit ad7d713eda469882de1680667607d0e74186b38b
author Julia Reynolds <juliacr@google.com> Wed Mar 21 16:05:00 2018 -0400
committer Julia Reynolds <juliacr@google.com> Thu Mar 22 16:55:46 2018 -0400
tree b88c15ddcf003205674ac83ea6dfc76a8ad2e029
parent 6f2965af7920d10f2c4eeed87718277782c2af43

Consolidate logic for 'recent notifications'

Test: runtest systemui-notification
Bug: 74318867
Change-Id: I962fe63f09f466d8e5e8238c66735b20f90c57b4

services/core/java/com/android/server/notification/NotificationManagerService.java

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 27eeb93..59cd561 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -1877,13 +1877,13 @@
         return newSuppressedVisualEffects;
     }
 
-    // TODO: log visual differences, not just audible ones
     @GuardedBy("mNotificationLock")
     protected void maybeRecordInterruptionLocked(NotificationRecord r) {
         if (r.isInterruptive()) {
             mAppUsageStats.reportInterruptiveNotification(r.sbn.getPackageName(),
                     r.getChannel().getId(),
                     getRealUserId(r.sbn.getUserId()));
+            logRecentLocked(r);
         }
     }
 
@@ -4344,10 +4344,6 @@
 
                     mNotificationsByKey.put(n.getKey(), r);
 
-                    if (!r.isUpdate) {
-                        logRecentLocked(r);
-                    }
-
                     // Ensure if this is a foreground service that the proper additional
                     // flags are set.
                     if ((notification.flags & Notification.FLAG_FOREGROUND_SERVICE) != 0) {