Don't cancel any notifications that are meant for all users, if no package is specified.
Bug: 7490028
Otherwise notifications such as the USB debugging and OTA notifications will be
dismissed when any user is stopped.
Change-Id: I0ae0c1136a999dd3aade99ca9e71c714b359eab4
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 @@
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;
}