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

Commit 0be9543f 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: 387a6bc3

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



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

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

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







                    if (!notification.isMediaNotification()











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







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











                        mUsageStats.registerBlocked(r);







                        mUsageStats.registerBlocked(r);











                        if (DBG) {







                        if (DBG) {