Merge "added call notif exemption to PostNotificationRunnable Test: NotificationManagerServiceTest Fixes: 227456870" into tm-dev

This commit is contained in:
Terence Zhang
2022-05-02 17:49:40 +00:00
committed by Android (Google) Code Review

View File

@@ -7371,6 +7371,7 @@ public class NotificationManagerService extends SystemService {
@Override @Override
public void run() { public void run() {
boolean appBanned = !areNotificationsEnabledForPackageInt(pkg, uid); boolean appBanned = !areNotificationsEnabledForPackageInt(pkg, uid);
boolean isCallNotification = isCallNotification(pkg, uid);
synchronized (mNotificationLock) { synchronized (mNotificationLock) {
try { try {
NotificationRecord r = null; NotificationRecord r = null;
@@ -7389,8 +7390,10 @@ public class NotificationManagerService extends SystemService {
final StatusBarNotification n = r.getSbn(); final StatusBarNotification n = r.getSbn();
final Notification notification = n.getNotification(); final Notification notification = n.getNotification();
boolean isCallNotificationAndCorrectStyle = isCallNotification
&& notification.isStyle(Notification.CallStyle.class);
if (!notification.isMediaNotification() if (!(notification.isMediaNotification() || isCallNotificationAndCorrectStyle)
&& (appBanned || isRecordBlockedLocked(r))) { && (appBanned || isRecordBlockedLocked(r))) {
mUsageStats.registerBlocked(r); mUsageStats.registerBlocked(r);
if (DBG) { if (DBG) {