Commit 4ab6d62c authored Oct 04, 2012 by John Spurlock Committed by Android Git Automerger Oct 04, 2012

am 220b7d0e: am 1205d16e: Merge "Clear notifications properly on...

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

* commit '220b7d0e':
  Clear notifications properly on ACTION_USER_STOPPED.

parents be535fc8 220b7d0e

services/java/com/android/server/NotificationManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;