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

Commit 19e3d826 authored by Philip Quinn's avatar Philip Quinn Committed by Automerger Merge Worker
Browse files

Merge "Revert "added call notif exemption to PostNotificationRunnable"" into... 

Merge "Revert "added call notif exemption to PostNotificationRunnable"" into tm-dev am: e536aa4f am: 8a540e5d am: fdba0dde

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



Change-Id: I976872caab50d04fde4166063e8a1d3b081d056a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5248a2a0 fdba0dde

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −4
Original line number Diff line number Diff line
@@ -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) {