commit 4285415f78ddd06c3aa0852e1bfa00889ec227cc
author Elliot Sisteron <elliotsisteron@google.com> Fri Jul 28 15:12:55 2023 +0000
committer Elliot Sisteron <elliotsisteron@google.com> Fri Jul 28 15:14:24 2023 +0000
tree fb7d106a1337c8c5302917d588a1227cce83e5ff
parent a58afff8d6efba6155548ef5449202fe0523c02c

Don't consider grouped notifications to be SC related.

Bug: 293593539
Test: atest SafetyCenterNotificationTest
Relnote: N/A
Change-Id: I34ca01eb79f56f4363d7d41189ea1d066241c3d2

tests/utils/safetycenter/java/com/android/safetycenter/testing/TestNotificationListener.kt

diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/TestNotificationListener.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/TestNotificationListener.kt
index f02c907..db714fa 100644
--- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/TestNotificationListener.kt
+++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/TestNotificationListener.kt
@@ -355,6 +355,11 @@
         }
 
         private fun StatusBarNotification.isSafetyCenterNotification(): Boolean =
-            packageName == "android" && notification.channelId.startsWith("safety_center")
+            packageName == "android" &&
+                notification.channelId.startsWith("safety_center") &&
+                // Don't consider the grouped system notifications to be a SC notification, in some
+                // scenarios a "ranker_group" notification can remain even when there are no more
+                // notifications associated with the channel. See b/293593539 for more details.
+                tag != "ranker_group"
     }
 }