diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-11-08 09:30:22 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 09:30:22 -0800 |
| commit | 081c36ded6a562ae2bde4238592a1e7bc13ba151 (patch) | |
| tree | da0681e6999039cb820b56d22ad82d303b32a898 /services | |
| parent | 4424951fa566b3bf6e57b08f615facc680059164 (diff) | |
| parent | bfb8a7b19234998e28afe811a193a6514a349ea5 (diff) | |
| download | frameworks_base-081c36ded6a562ae2bde4238592a1e7bc13ba151.zip frameworks_base-081c36ded6a562ae2bde4238592a1e7bc13ba151.tar.gz frameworks_base-081c36ded6a562ae2bde4238592a1e7bc13ba151.tar.bz2 | |
am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev
* commit 'bfb8a7b19234998e28afe811a193a6514a349ea5':
Don't cancel any notifications that are meant for all users, if no package is specified.
Diffstat (limited to 'services')
| -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 0e171cd..216323e 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; } |