Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b754ca68 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

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
parent 5f9b85ff

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

+1 −1
Original line number Diff line number Diff line
@@ -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) {

tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java

+5 −0
Original line number Diff line number Diff line
@@ -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()

                {