Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check URIs in notification public version. am: 67cd169d07 am: 364105afb2 am: effbcfe8d7 am: 03196bf425 am: 1983ef5cdd

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

Change-Id: I94a3c82354b2bb8dd9dcd18f15da292d32e86268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioana Alexandru
2023-05-25 13:28:39 +00:00
committed by Automerger Merge Worker
parent 024f59efe2 1983ef5cdd
commit 21b642e35e
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/Notification.java
View File

@@ -2807,6 +2807,10 @@ public class Notification implements Parcelable
* @hide * @hide
*/ */
public void visitUris(@NonNull Consumer<Uri> visitor) { public void visitUris(@NonNull Consumer<Uri> visitor) {
if (publicVersion != null) {
publicVersion.visitUris(visitor);
}
visitor.accept(sound); visitor.accept(sound);
if (tickerView != null) tickerView.visitUris(visitor); if (tickerView != null) tickerView.visitUris(visitor);

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

@@ -5427,6 +5427,26 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
verify(visitor, times(1)).accept(eq(historyUri2)); 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 @Test
public void testVisitUris_audioContentsString() throws Exception { public void testVisitUris_audioContentsString() throws Exception {
final Uri audioContents = Uri.parse("content://com.example/audio"); final Uri audioContents = Uri.parse("content://com.example/audio");