diff options
| author | John Spurlock <jspurlock@google.com> | 2012-10-04 09:09:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-04 09:09:15 -0700 |
| commit | 1205d16e020beeb16f05e0d788fdf7ed478623f6 (patch) | |
| tree | 02c0a484dca02bc818de9a297f87f4f945b09e53 | |
| parent | 31fed73701041cd5455942abe2dacfc7639c5370 (diff) | |
| parent | 078a490c2276c91ab84536d603c7848dc244e330 (diff) | |
| download | frameworks_base-1205d16e020beeb16f05e0d788fdf7ed478623f6.zip frameworks_base-1205d16e020beeb16f05e0d788fdf7ed478623f6.tar.gz frameworks_base-1205d16e020beeb16f05e0d788fdf7ed478623f6.tar.bz2 | |
Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev
| -rwxr-xr-x | services/java/com/android/server/NotificationManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 5d5f8d3..8d6c604 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -1240,7 +1240,7 @@ public class NotificationManagerService extends INotificationManager.Stub if ((r.notification.flags & mustNotHaveFlags) != 0) { continue; } - if (!r.pkg.equals(pkg)) { + if (pkg != null && !r.pkg.equals(pkg)) { continue; } canceledSomething = true; |