Merge "Merge "Throttle Spammy onNotificationChannelModified" into tm-qpr-dev... (783944db) · Commits · e / os / android_frameworks_base

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

+33 −4

Original line number	Original line	Diff line number	Diff line
	@@ -166,6 +166,11 @@ public class NotifCollection implements Dumpable, PipelineDumpable {


	private Queue<NotifEvent> mEventQueue = new ArrayDeque<>();		private Queue<NotifEvent> mEventQueue = new ArrayDeque<>();
			private final Runnable mRebuildListRunnable = () -> {
			if (mBuildListener != null) {
			mBuildListener.onBuildList(mReadOnlyNotificationSet, "asynchronousUpdate");
			}
			};

	private boolean mAttached = false;		private boolean mAttached = false;
	private boolean mAmDispatchingToOtherCode;		private boolean mAmDispatchingToOtherCode;
	@@ -462,7 +467,7 @@ public class NotifCollection implements Dumpable, PipelineDumpable {
	int modificationType) {		int modificationType) {
	Assert.isMainThread();		Assert.isMainThread();
	mEventQueue.add(new ChannelChangedEvent(pkgName, user, channel, modificationType));		mEventQueue.add(new ChannelChangedEvent(pkgName, user, channel, modificationType));
	dispatchEventsAndRebuildList("onNotificationChannelModified");		dispatchEventsAndAsynchronouslyRebuildList();
	}		}

	private void onNotificationsInitialized() {		private void onNotificationsInitialized() {
	@@ -621,15 +626,39 @@ public class NotifCollection implements Dumpable, PipelineDumpable {

	private void dispatchEventsAndRebuildList(String reason) {		private void dispatchEventsAndRebuildList(String reason) {
	Trace.beginSection("NotifCollection.dispatchEventsAndRebuildList");		Trace.beginSection("NotifCollection.dispatchEventsAndRebuildList");
			if (mMainHandler.hasCallbacks(mRebuildListRunnable)) {
			mMainHandler.removeCallbacks(mRebuildListRunnable);
			}

			dispatchEvents();

			if (mBuildListener != null) {
			mBuildListener.onBuildList(mReadOnlyNotificationSet, reason);
			}
			Trace.endSection();
			}

			private void dispatchEventsAndAsynchronouslyRebuildList() {
			Trace.beginSection("NotifCollection.dispatchEventsAndAsynchronouslyRebuildList");

			dispatchEvents();

			if (!mMainHandler.hasCallbacks(mRebuildListRunnable)) {
			mMainHandler.postDelayed(mRebuildListRunnable, 1000L);
			}

			Trace.endSection();
			}

			private void dispatchEvents() {
			Trace.beginSection("NotifCollection.dispatchEvents");

	mAmDispatchingToOtherCode = true;		mAmDispatchingToOtherCode = true;
	while (!mEventQueue.isEmpty()) {		while (!mEventQueue.isEmpty()) {
	mEventQueue.remove().dispatchTo(mNotifCollectionListeners);		mEventQueue.remove().dispatchTo(mNotifCollectionListeners);
	}		}
	mAmDispatchingToOtherCode = false;		mAmDispatchingToOtherCode = false;

	if (mBuildListener != null) {
	mBuildListener.onBuildList(mReadOnlyNotificationSet, reason);
	}
	Trace.endSection();		Trace.endSection();
	}		}

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

+85 −0

Original line number	Original line	Diff line number	Diff line
	@@ -106,6 +106,7 @@ import org.mockito.InOrder;
	import org.mockito.Mock;		import org.mockito.Mock;
	import org.mockito.MockitoAnnotations;		import org.mockito.MockitoAnnotations;
	import org.mockito.Spy;		import org.mockito.Spy;
			import org.mockito.stubbing.Answer;

	import java.util.Arrays;		import java.util.Arrays;
	import java.util.Collection;		import java.util.Collection;
	@@ -377,6 +378,90 @@ public class NotifCollectionTest extends SysuiTestCase {
	NOTIFICATION_CHANNEL_OR_GROUP_UPDATED);		NOTIFICATION_CHANNEL_OR_GROUP_UPDATED);
	}		}

			@Test
			public void testScheduleBuildNotificationListWhenChannelChanged() {
			// GIVEN
			final NotificationEntryBuilder neb = buildNotif(TEST_PACKAGE, 48);
			final NotificationChannel channel = new NotificationChannel(
			"channelId",
			"channelName",
			NotificationManager.IMPORTANCE_DEFAULT);
			neb.setChannel(channel);

			final NotifEvent notif = mNoMan.postNotif(neb);
			final NotificationEntry entry = mCollectionListener.getEntry(notif.key);

			when(mMainHandler.hasCallbacks(any())).thenReturn(false);

			clearInvocations(mBuildListener);

			// WHEN
			mNotifHandler.onNotificationChannelModified(TEST_PACKAGE,
			entry.getSbn().getUser(), channel, NOTIFICATION_CHANNEL_OR_GROUP_UPDATED);

			// THEN
			verify(mMainHandler).postDelayed(any(), eq(1000L));
			}

			@Test
			public void testCancelScheduledBuildNotificationListEventWhenNotifUpdatedSynchronously() {
			// GIVEN
			final NotificationEntry entry1 = buildNotif(TEST_PACKAGE, 1)
			.setGroup(mContext, "group_1")
			.build();
			final NotificationEntry entry2 = buildNotif(TEST_PACKAGE, 2)
			.setGroup(mContext, "group_1")
			.setContentTitle(mContext, "New version")
			.build();
			final NotificationEntry entry3 = buildNotif(TEST_PACKAGE, 3)
			.setGroup(mContext, "group_1")
			.build();

			final List<CoalescedEvent> entriesToBePosted = Arrays.asList(
			new CoalescedEvent(entry1.getKey(), 0, entry1.getSbn(), entry1.getRanking(), null),
			new CoalescedEvent(entry2.getKey(), 1, entry2.getSbn(), entry2.getRanking(), null),
			new CoalescedEvent(entry3.getKey(), 2, entry3.getSbn(), entry3.getRanking(), null)
			);

			when(mMainHandler.hasCallbacks(any())).thenReturn(true);

			// WHEN
			mNotifHandler.onNotificationBatchPosted(entriesToBePosted);

			// THEN
			verify(mMainHandler).removeCallbacks(any());
			}

			@Test
			public void testBuildNotificationListWhenChannelChanged() {
			// GIVEN
			final NotificationEntryBuilder neb = buildNotif(TEST_PACKAGE, 48);
			final NotificationChannel channel = new NotificationChannel(
			"channelId",
			"channelName",
			NotificationManager.IMPORTANCE_DEFAULT);
			neb.setChannel(channel);

			final NotifEvent notif = mNoMan.postNotif(neb);
			final NotificationEntry entry = mCollectionListener.getEntry(notif.key);

			when(mMainHandler.hasCallbacks(any())).thenReturn(false);
			when(mMainHandler.postDelayed(any(), eq(1000L))).thenAnswer((Answer) invocation -> {
			final Runnable runnable = invocation.getArgument(0);
			runnable.run();
			return null;
			});

			clearInvocations(mBuildListener);

			// WHEN
			mNotifHandler.onNotificationChannelModified(TEST_PACKAGE,
			entry.getSbn().getUser(), channel, NOTIFICATION_CHANNEL_OR_GROUP_UPDATED);

			// THEN
			verifyBuiltList(List.of(entry));
			}

	@Test		@Test
	public void testRankingsAreUpdatedForOtherNotifs() {		public void testRankingsAreUpdatedForOtherNotifs() {
	// GIVEN a collection with one notif		// GIVEN a collection with one notif