Merge "Don't cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev

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