Merge "Check URIs in notification public version." into rvc-dev (6f9b881a) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -2492,6 +2492,10 @@ public class Notification implements Parcelable
		* @hide
		*/
		public void visitUris(@NonNull Consumer<Uri> visitor) {
		if (publicVersion != null) {
		publicVersion.visitUris(visitor);
		}

		visitor.accept(sound);

		if (tickerView != null) tickerView.visitUris(visitor);

+20 −0

Original line number	Diff line number	Diff line
		@@ -4298,6 +4298,26 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
		verify(visitor, times(1)).accept(eq(historyUri2));
		}

		@Test
		public void testVisitUris_publicVersion() throws Exception {
		final Icon smallIconPublic = Icon.createWithContentUri("content://media/small/icon");
		final Icon largeIconPrivate = Icon.createWithContentUri("content://media/large/icon");

		Notification publicVersion = new Notification.Builder(mContext, "a")
		.setContentTitle("notification with uris")
		.setSmallIcon(smallIconPublic)
		.build();
		Notification n = new Notification.Builder(mContext, "a")
		.setLargeIcon(largeIconPrivate)
		.setPublicVersion(publicVersion)
		.build();

		Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);
		n.visitUris(visitor);
		verify(visitor, times(1)).accept(eq(smallIconPublic.getUri()));
		verify(visitor, times(1)).accept(eq(largeIconPrivate.getUri()));
		}

		@Test
		public void testVisitUris_messagingStyle() {
		final Icon personIcon1 = Icon.createWithContentUri("content://media/person1");