From 5ec00e930fb4d523ce5784fb336841410d030cef Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 7 Nov 2012 16:58:30 -0800
Subject: [PATCH] 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
---
 .../java/com/android/server/NotificationManagerService.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java
index 0e171cdf6c470..216323ea6577c 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;
                 }