Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev

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 5d5f8d37d222..8d6c60446a8a 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;