From b754ca687639bc63e89b05029081ead1162e8152 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Wed, 12 Oct 2016 10:31:55 -0400 Subject: [PATCH] Fix channel conditional in cancelAll. Bug: 32083625 Test: manual and runtest systemui-jank -c android.platform.systemui.tests.jank.SystemUiJankTests -m testNotificationListPull Change-Id: I1b9bb7a287be461d832816f22822c6dd6eb5e8f0 --- .../server/notification/NotificationManagerService.java | 2 +- .../src/com/android/statusbartest/NotificationTestList.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 0c7c8aa8a9b56..4d72d8e75df71 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -3641,7 +3641,7 @@ public class NotificationManagerService extends SystemService { if (pkg != null && !r.sbn.getPackageName().equals(pkg)) { continue; } - if (channelId == null || !channelId.equals(r.getChannel().getId())) { + if (channelId != null && !channelId.equals(r.getChannel().getId())) { continue; } if (canceledNotifications == null) { diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java index a4aab7c268b0d..da27ea916a18a 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java @@ -87,6 +87,11 @@ public class NotificationTestList extends TestActivity } private Test[] mTests = new Test[] { + new Test("cancel all") { + public void run() { + mNM.cancelAll(); + } + }, new Test("Phone call") { public void run() {