Merge "Set textChanged for new notifications" into sc-v2-dev (cb9b8086) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -7067,7 +7067,9 @@ public class NotificationManagerService extends SystemService {
		if (index < 0) {
		mNotificationList.add(r);
		mUsageStats.registerPostedByApp(r);
		r.setInterruptive(isVisuallyInterruptive(null, r));
		final boolean isInterruptive = isVisuallyInterruptive(null, r);
		r.setInterruptive(isInterruptive);
		r.setTextChanged(isInterruptive);
		} else {
		old = mNotificationList.get(index); // Potentially changes old
		mNotificationList.set(index, r);

+13 −0

Original line number	Diff line number	Diff line
		@@ -3871,6 +3871,19 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
		r.getStats().getDismissalSentiment());
		}

		@Test
		public void testTextChangedSet_forNewNotifs() throws Exception {
		NotificationRecord original = generateNotificationRecord(mTestNotificationChannel);
		mService.addEnqueuedNotification(original);

		NotificationManagerService.PostNotificationRunnable runnable =
		mService.new PostNotificationRunnable(original.getKey());
		runnable.run();
		waitForIdle();

		assertTrue(original.isTextChanged());
		}

		@Test
		public void testVisuallyInterruptive_notSeen() throws Exception {
		NotificationRecord original = generateNotificationRecord(mTestNotificationChannel);