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

Merge "Send ranking update on channel update."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-24 22:42:03 +00:00
committed by Android (Google) Code Review
parent a608207fc3 a5d2f235ad
commit ab78912972
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/BadgeExtractor.java
View File

@@ -46,7 +46,9 @@ public class BadgeExtractor implements NotificationSignalExtractor {
if (!appCanShowBadge) {
record.setShowBadge(false);
} else {
record.setShowBadge(record.getChannel().canShowBadge() && appCanShowBadge);
record.setShowBadge(mConfig.getNotificationChannel(record.sbn.getPackageName(),
record.sbn.getUid(), record.getChannel().getId(), false).canShowBadge()
&& appCanShowBadge);
}
return null;

4
services/tests/notification/src/com/android/server/notification/BadgeExtractorTest.java
View File

@@ -89,6 +89,7 @@ public class BadgeExtractorTest {
when(mConfig.canShowBadge(mPkg, mUid)).thenReturn(true);
NotificationChannel channel =
new NotificationChannel("a", "a", NotificationManager.IMPORTANCE_UNSPECIFIED);
when(mConfig.getNotificationChannel(mPkg, mUid, "a", false)).thenReturn(channel);
channel.setShowBadge(false);
NotificationRecord r = getNotificationRecord(channel);
@@ -107,6 +108,7 @@ public class BadgeExtractorTest {
NotificationChannel channel =
new NotificationChannel("a", "a", NotificationManager.IMPORTANCE_HIGH);
channel.setShowBadge(true);
when(mConfig.getNotificationChannel(mPkg, mUid, "a", false)).thenReturn(channel);
NotificationRecord r = getNotificationRecord(channel);
@@ -124,6 +126,7 @@ public class BadgeExtractorTest {
NotificationChannel channel =
new NotificationChannel("a", "a", NotificationManager.IMPORTANCE_UNSPECIFIED);
channel.setShowBadge(true);
when(mConfig.getNotificationChannel(mPkg, mUid, "a", false)).thenReturn(channel);
NotificationRecord r = getNotificationRecord(channel);
@@ -141,6 +144,7 @@ public class BadgeExtractorTest {
NotificationChannel channel =
new NotificationChannel("a", "a", NotificationManager.IMPORTANCE_UNSPECIFIED);
channel.setShowBadge(false);
when(mConfig.getNotificationChannel(mPkg, mUid, "a", false)).thenReturn(channel);
NotificationRecord r = getNotificationRecord(channel);