Merge "Revert "added call notif exemption to PostNotificationRunnable"" into tm-dev am: e536aa4f9e am: 8a540e5d76 am: fdba0dde04

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130632

Change-Id: I976872caab50d04fde4166063e8a1d3b081d056a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Philip Quinn
2022-05-03 08:44:45 +00:00
committed by Automerger Merge Worker

View File

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