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.
This commit is contained in:
Amith Yamasani
2012-11-08 09:27:23 -08:00
committed by Android Git Automerger

View File

@@ -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;
}