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

Commit fdba0dde 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

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



Change-Id: Ifc54609008f11a29e68955755d45a2c3a3bb1723
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb8e0771 8a540e5d

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