Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea36937 authored Jun 26, 2020 by Ned Burns

Ignore nonsensical clears from NoMan

It appears that NoMan sometimes fails to send onNotificationPosted
events for some notifications (possibly due to the notification limit?).
It's possible to still receive onNotificationRemoved events for those
notifications, so we ignore those events for now (long-term we should
figure out if this is indeed a problem in NoMan).

Bug: 159652654
Test: atest
Change-Id: Ib15320f537e31a675d2766ba458b7bd019764c73

parent 350ffad6

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -382,9 +382,8 @@ public class NotifCollection implements Dumpable {

	final NotificationEntry entry = mNotificationSet.get(sbn.getKey());		final NotificationEntry entry = mNotificationSet.get(sbn.getKey());
	if (entry == null) {		if (entry == null) {
	crashIfNotInitializing(		// TODO (b/160008901): Throw an exception here
	new IllegalStateException("No notification to remove with key "		mLogger.logNoNotificationToRemoveWithKey(sbn.getKey());
	+ sbn.getKey()));
	return;		return;
	}		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -121,6 +121,14 @@ class NotifCollectionLogger @Inject constructor(
	})		})
	}		}

			fun logNoNotificationToRemoveWithKey(key: String) {
			buffer.log(TAG, ERROR, {
			str1 = key
			}, {
			"No notification to remove with key $str1"
			})
			}

	fun logRankingMissing(key: String, rankingMap: RankingMap) {		fun logRankingMissing(key: String, rankingMap: RankingMap) {
	buffer.log(TAG, WARNING, { str1 = key }, { "Ranking update is missing ranking for $str1" })		buffer.log(TAG, WARNING, { str1 = key }, { "Ranking update is missing ranking for $str1" })
	buffer.log(TAG, DEBUG, {}, { "Ranking map contents:" })		buffer.log(TAG, DEBUG, {}, { "Ranking map contents:" })

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1273,8 +1273,8 @@ public class NotifCollectionTest extends SysuiTestCase {
	verify(mInterceptor3, never()).shouldInterceptDismissal(clearable);		verify(mInterceptor3, never()).shouldInterceptDismissal(clearable);
	}		}

	@Test(expected = IllegalStateException.class)		@Test
	public void testClearNotificationThrowsIfMissing() {		public void testClearNotificationDoesntThrowIfMissing() {
	// GIVEN that enough time has passed that we're beyond the forgiveness window		// GIVEN that enough time has passed that we're beyond the forgiveness window
	mClock.advanceTime(5001);		mClock.advanceTime(5001);

	@@ -1287,7 +1287,8 @@ public class NotifCollectionTest extends SysuiTestCase {
	container.getSbn(),		container.getSbn(),
	new RankingMap(new Ranking[]{ container.getRanking() }));		new RankingMap(new Ranking[]{ container.getRanking() }));

	// THEN an exception is thrown		// THEN the event is ignored
			verify(mCollectionListener, never()).onEntryRemoved(any(NotificationEntry.class), anyInt());
	}		}

	@Test		@Test