commit 723a7028c79ac4c9786c5f123cd96c0bb2dd1202
author Julia Reynolds <juliacr@google.com> Mon Sep 14 18:45:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 14 18:45:40 2020 +0000
tree bcb5e262b248813fa2b86b99387d8b0ddfbed057
parent b5078ea31df3f9b72390b0823dea743ba390cd03
parent 8092c9b37dc1390d48f9b17f3ef1ebb6b63791db

Merge "Add log to NoMan for canceled cancels" into rvc-qpr-dev am: 8092c9b37d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12585704

Change-Id: If8fe5ff4c178a3173761f03112b0b8da67dc15fe

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 d254419..a0f8373 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -6245,6 +6245,8 @@
                     for (NotificationRecord r : enqueued) {
                         if (r.mUpdateTimeMs > mWhen) {
                             // At least one enqueue was posted after the cancel, so we're invalid
+                            Slog.i(TAG, "notification cancel ignored due to newer enqueued entry"
+                                    + "key=" + r.getSbn().getKey());
                             return;
                         }
                     }