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

Commit 61189b08 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix channel conditional in cancelAll."

parents 21986f2a b754ca68

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()

                {