Merge "DO NOT MERGE: Don't let NotificationEntryManager keep around old RankingMaps" into qt-dev (5c9dd546) · Commits · e / os / android_frameworks_base

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ public class NotificationEntryManager implements
		private NotificationRowBinder mNotificationRowBinder;

		private NotificationPresenter mPresenter;
		private NotificationListenerService.RankingMap mLatestRankingMap;
		@VisibleForTesting
		protected NotificationData mNotificationData;

		@@ -163,8 +162,7 @@ public class NotificationEntryManager implements
		/** Adds a {@link NotificationLifetimeExtender}. */
		public void addNotificationLifetimeExtender(NotificationLifetimeExtender extender) {
		mNotificationLifetimeExtenders.add(extender);
		extender.setCallback(key -> removeNotification(key, mLatestRankingMap,
		UNDEFINED_DISMISS_REASON));
		extender.setCallback(key -> removeNotification(key, null, UNDEFINED_DISMISS_REASON));
		}

		public NotificationData getNotificationData() {
		@@ -302,7 +300,6 @@ public class NotificationEntryManager implements
		if (!forceRemove && !entryDismissed) {
		for (NotificationLifetimeExtender extender : mNotificationLifetimeExtenders) {
		if (extender.shouldExtendLifetime(entry)) {
		mLatestRankingMap = ranking;
		extendLifetime(entry, extender);
		lifetimeExtended = true;
		break;

+3 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,9 @@ public class NotificationData {
		removed = mEntries.remove(key);
		}
		if (removed == null) return null;
		// NEM may pass us a null ranking map if removing a lifetime-extended notification,
		// so use the most recent ranking
		if (ranking == null) ranking = mRankingMap;
		mGroupManager.onEntryRemoved(removed);
		updateRankingAndSort(ranking);
		return removed;