am 220b7d0e: am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev

* commit '220b7d0ee221b2517189e0fc4c60c77e162b9b36': Clear notifications properly on ACTION_USER_STOPPED.
2012-10-04 09:12:55 -07:00
parent be535fc867 220b7d0ee2
commit 4ab6d62c35
1 changed files with 1 additions and 1 deletions
--- 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;