commit effbcfe8d75d96932c83f4d61df6cfe18203ee76
author Ioana Alexandru <aioana@google.com> Thu May 25 11:17:45 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 25 11:17:45 2023 +0000
tree 7c89d610fa54020258cee3c15d7fd2c4c9dd3a0e
parent 95dcc1c36e12a741a45b362ae311d813605f0213
parent 364105afb2b55edbd457f5f615d7c5729bd0ed84

Check URIs in notification public version. am: 67cd169d07 am: 364105afb2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23410117

Change-Id: Id5211a1731336b3c670bdcc054bf0b10bb6ef017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 13d9b5c..1a4c8f0 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -2761,6 +2761,10 @@
      * @hide
      */
     public void visitUris(@NonNull Consumer<Uri> visitor) {
+        if (publicVersion != null) {
+            publicVersion.visitUris(visitor);
+        }
+
         visitor.accept(sound);
 
         if (tickerView != null) tickerView.visitUris(visitor);

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
index 4df614f..ef83ae2 100755
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -4501,6 +4501,26 @@
     }
 
     @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_audioContentsString() throws Exception {
         final Uri audioContents = Uri.parse("content://com.example/audio");