Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix channel conditional in cancelAll.

Browse Source 
Bug: 32083625
Test: manual and runtest systemui-jank -c android.platform.systemui.tests.jank.SystemUiJankTests -m testNotificationListPull
Change-Id: I1b9bb7a287be461d832816f22822c6dd6eb5e8f0
This commit is contained in:
Julia Reynolds
2016-10-12 10:31:55 -04:00
parent 5f9b85ff4c
commit b754ca6876
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -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) {

5
tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java
View File

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