Merge "Ignore null notifications" into ub-launcher3-master (00f9712c) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/notification/NotificationListener.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -219,6 +219,10 @@ public class NotificationListener extends NotificationListenerService {
		@Override
		public void onNotificationPosted(final StatusBarNotification sbn) {
		super.onNotificationPosted(sbn);
		if (sbn == null) {
		// There is a bug in platform where we can get a null notification; just ignore it.
		return;
		}
		mWorkerHandler.obtainMessage(MSG_NOTIFICATION_POSTED, new NotificationPostedMsg(sbn))
		.sendToTarget();
		if (sStatusBarNotificationsChangedListener != null) {
		@@ -244,6 +248,10 @@ public class NotificationListener extends NotificationListenerService {
		@Override
		public void onNotificationRemoved(final StatusBarNotification sbn) {
		super.onNotificationRemoved(sbn);
		if (sbn == null) {
		// There is a bug in platform where we can get a null notification; just ignore it.
		return;
		}
		Pair<PackageUserKey, NotificationKeyData> packageUserKeyAndNotificationKey
		= new Pair<>(PackageUserKey.fromNotification(sbn),
		NotificationKeyData.fromNotification(sbn));