From 38156c504e49e685b67b5f003a11876438157c4f Mon Sep 17 00:00:00 2001 From: Justin Koh Date: Wed, 4 Jun 2014 13:57:49 -0700 Subject: Add check to allow notification listener packages to post >50 notifications Bug: 13433398 Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68 (cherry picked from commit 2dbd36fc7f9341ecef51c2ed96a0f21b046f5a8d) --- .../notification/NotificationManagerService.java | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index f2ac963a26d5..a3f5fee21098 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -1535,14 +1535,15 @@ public class NotificationManagerService extends SystemService { } checkCallerIsSystemOrSameApp(pkg); final boolean isSystemNotification = isUidSystem(callingUid) || ("android".equals(pkg)); + final boolean isNotificationFromListener = mListeners.isListenerPackage(pkg); final int userId = ActivityManager.handleIncomingUser(callingPid, callingUid, incomingUserId, true, false, "enqueueNotification", pkg); final UserHandle user = new UserHandle(userId); // Limit the number of notifications that any given package except the android - // package can enqueue. Prevents DOS attacks and deals with leaks. - if (!isSystemNotification) { + // package or a registered listener can enqueue. Prevents DOS attacks and deals with leaks. + if (!isSystemNotification && !isNotificationFromListener) { synchronized (mNotificationList) { int count = 0; final int N = mNotificationList.size(); @@ -2727,6 +2728,21 @@ public class NotificationManagerService extends SystemService { Log.e(TAG, "unable to notify listener (listener hints): " + listener, ex); } } + + private boolean isListenerPackage(String packageName) { + if (packageName == null) { + return false; + } + // TODO: clean up locking object later + synchronized (mNotificationList) { + for (final ManagedServiceInfo serviceInfo : mServices) { + if (packageName.equals(serviceInfo.component.getPackageName())) { + return true; + } + } + } + return false; + } } public static final class DumpFilter { -- cgit v1.2.3-59-g8ed1b