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

Commit a61f179c authored by Chris Wren's avatar Chris Wren
Browse files

only rate limit notification updates 

Updates to progress bars are the main culprit in system
performance events caused by apps spamming the notification
service. Rate-limiting only updates allows us to set a lower
threshold wihtout the owrry of mistakenly dropping bursts of
notifications being quickly posted after a network sync.

Also reduce logspam caused by the rate-limit events.

Bug: 30132961
Change-Id: I49acda6a2831204da45e899ddd3d62d571d7174b
parent 3c2587f2

core/java/android/app/NotificationManager.java

+2 −2
Original line number Diff line number Diff line
@@ -312,8 +312,8 @@ public class NotificationManager 
        try {

            service.enqueueNotificationWithTag(pkg, mContext.getOpPackageName(), tag, id,

                    copy, idOut, user.getIdentifier());

            if (id != idOut[0]) {

                Log.w(TAG, "notify: id corrupted: sent " + id + ", got back " + idOut[0]);

            if (localLOGV && id != idOut[0]) {

                Log.v(TAG, "notify: id corrupted: sent " + id + ", got back " + idOut[0]);

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

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

+22 −18
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class NotificationManagerService extends SystemService { 
            = SystemProperties.getBoolean("debug.child_notifs", true);



    static final int MAX_PACKAGE_NOTIFICATIONS = 50;

    static final float DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE = 50f;

    static final float DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE = 10f;



    // message codes

    static final int MESSAGE_TIMEOUT = 2;
@@ -2538,10 +2538,21 @@ public class NotificationManagerService extends SystemService { 


        mUsageStats.registerEnqueuedByApp(pkg);





        if (pkg == null || notification == null) {

            throw new IllegalArgumentException("null not allowed: pkg=" + pkg

                    + " id=" + id + " notification=" + notification);

        }

        final StatusBarNotification n = new StatusBarNotification(

                pkg, opPkg, id, tag, callingUid, callingPid, 0, notification,

                user);



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

        // package or a registered listener can enqueue.  Prevents DOS attacks and deals with leaks.

        if (!isSystemNotification && !isNotificationFromListener) {

            synchronized (mNotificationList) {

                if(mNotificationsByKey.get(n.getKey()) != null) {

                    // this is an update, rate limit updates only

                    final float appEnqueueRate = mUsageStats.getAppEnqueueRate(pkg);

                    if (appEnqueueRate > mMaxPackageEnqueueRate) {

                        mUsageStats.registerOverRateQuota(pkg);
@@ -2553,6 +2564,7 @@ public class NotificationManagerService extends SystemService { 
                        }

                        return;

                    }

                }



                int count = 0;

                final int N = mNotificationList.size();
@@ -2574,11 +2586,6 @@ public class NotificationManagerService extends SystemService { 
            }

        }



        if (pkg == null || notification == null) {

            throw new IllegalArgumentException("null not allowed: pkg=" + pkg

                    + " id=" + id + " notification=" + notification);

        }



        // Whitelist pending intents.

        if (notification.allPendingIntents != null) {

            final int intentCount = notification.allPendingIntents.size();
@@ -2601,9 +2608,6 @@ public class NotificationManagerService extends SystemService { 
                Notification.PRIORITY_MAX);



        // setup local book-keeping

        final StatusBarNotification n = new StatusBarNotification(

                pkg, opPkg, id, tag, callingUid, callingPid, 0, notification,

                user);

        final NotificationRecord r = new NotificationRecord(getContext(), n);

        mHandler.post(new EnqueueNotificationRunnable(userId, r));