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

Commit 68e42c74 authored by Sailesh Nepal's avatar Sailesh Nepal Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: Remove rate limiting for system dialer notifications" into oc-dr1-dev 

am: b4cc14b5

Change-Id: Ie23cfd2911cc08a2eb415c2293ed0820c07bc47d
parents 33fa8402 b4cc14b5

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

+5 −1
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ import android.service.notification.SnoozeCriterion; 
import android.service.notification.StatusBarNotification;

import android.service.notification.ZenModeConfig;

import android.service.notification.ZenModeProto;

import android.telecom.TelecomManager;

import android.telephony.PhoneStateListener;

import android.telephony.TelephonyManager;

import android.text.TextUtils;
@@ -3506,8 +3507,11 @@ public class NotificationManagerService extends SystemService { 
    private boolean checkDisqualifyingFeatures(int userId, int callingUid, int id, String tag,

            NotificationRecord r) {

        final String pkg = r.sbn.getPackageName();

        final String dialerPackage =

                getContext().getSystemService(TelecomManager.class).getSystemDialerPackage();

        final boolean isSystemNotification =

                isUidSystemOrPhone(callingUid) || ("android".equals(pkg));

                isUidSystemOrPhone(callingUid) || ("android".equals(pkg))

                || TextUtils.equals(pkg, dialerPackage);

        final boolean isNotificationFromListener = mListeners.isListenerPackage(pkg);



        // Limit the number of notifications that any given package except the android