diff options
author | Amith Yamasani <yamasani@google.com> | 2012-11-07 21:16:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-07 21:16:00 -0800 |
commit | 9eacab8abee6b8d154f5de2513fcbaed313c4b24 (patch) | |
tree | 7f7ec801441f52c4c677f8b87302d7e98a01be51 | |
parent | e7e210cb4373877785130ff06ad4e6635592eaa8 (diff) | |
parent | 3fe2cb4db60827889abd1f971910f807ae346488 (diff) | |
download | base-9eacab8abee6b8d154f5de2513fcbaed313c4b24.tar.gz |
am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
* commit '3fe2cb4db60827889abd1f971910f807ae346488':
Don't cancel any notifications that are meant for all users, if no package is specified.
-rwxr-xr-x | services/java/com/android/server/NotificationManagerService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 0e171cdf6c47..216323ea6577 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -1261,6 +1261,10 @@ public class NotificationManagerService extends INotificationManager.Stub if (!notificationMatchesUserId(r, userId)) { continue; } + // Don't remove notifications to all, if there's no package name specified + if (r.userId == UserHandle.USER_ALL && pkg == null) { + continue; + } if ((r.notification.flags & mustHaveFlags) != mustHaveFlags) { continue; } |