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

Commit 6889470b authored by Terence Zhang's avatar Terence Zhang Committed by Automerger Merge Worker
Browse files

Merge "added call notif exemption to PostNotificationRunnable Test:... 

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

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



Change-Id: Ic4e808ae0ef9b31ae46301878a1f581695ecd27f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 732409e1 40c17d6c

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

+4 −1
Original line number Diff line number Diff line
@@ -7371,6 +7371,7 @@ 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;
@@ -7389,8 +7390,10 @@ 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()













                    if (!(notification.isMediaNotification() || isCallNotificationAndCorrectStyle)















                            && (appBanned || isRecordBlockedLocked(r))) {















                        mUsageStats.registerBlocked(r);















                        if (DBG) {