Merge "Fix NPE when updating rankings for pending notifs" (0ac7555b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.annotation.Nullable;
		import android.app.Notification;
		import android.content.Context;
		import android.service.notification.NotificationListenerService;
		import android.service.notification.NotificationListenerService.Ranking;
		import android.service.notification.StatusBarNotification;
		import android.util.ArrayMap;
		import android.util.Log;
		@@ -390,7 +391,7 @@ public class NotificationEntryManager implements
		}

		mNotificationData.updateRanking(rankingMap);
		NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking();
		Ranking ranking = new Ranking();
		rankingMap.getRanking(key, ranking);

		NotificationEntry entry = new NotificationEntry(notification, ranking);
		@@ -513,12 +514,13 @@ public class NotificationEntryManager implements
		if (rankingMap == null) {
		return;
		}
		NotificationListenerService.Ranking ranking = new NotificationListenerService.Ranking();
		for (NotificationEntry pendingNotification : mPendingNotifications.values()) {
		rankingMap.getRanking(pendingNotification.key, ranking);
		Ranking ranking = new Ranking();
		if (rankingMap.getRanking(pendingNotification.key(), ranking)) {
		pendingNotification.setRanking(ranking);
		}
		}
		}

		/**
		* @return An iterator for all "pending" notifications. Pending notifications are newly-posted