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

Merge "Verify URI permissions for notification shortcutIcon." into tm-dev am: d3b8ddbc38

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

Change-Id: I1d9b6d5c174ecb3095cd242744c623e00652967e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioana Alexandru
2023-05-09 09:40:30 +00:00
committed by Automerger Merge Worker
parent bc6f937d9f d3b8ddbc38
commit ca1c5ef7eb
2 changed files with 70 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2892,6 +2892,8 @@ public class Notification implements Parcelable
}
}
}
visitIconUri(visitor, extras.getParcelable(EXTRA_CONVERSATION_ICON));
}
if (isStyle(CallStyle.class) & extras != null) {

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

@@ -5100,6 +5100,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
public void testVisitUris() throws Exception {
final Uri audioContents = Uri.parse("content://com.example/audio");
final Uri backgroundImage = Uri.parse("content://com.example/background");
final Icon smallIcon = Icon.createWithContentUri("content://media/small/icon");
final Icon largeIcon = Icon.createWithContentUri("content://media/large/icon");
final Icon personIcon1 = Icon.createWithContentUri("content://media/person1");
final Icon personIcon2 = Icon.createWithContentUri("content://media/person2");
final Icon personIcon3 = Icon.createWithContentUri("content://media/person3");
@@ -5133,7 +5135,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
Notification n = new Notification.Builder(mContext, "a")
.setContentTitle("notification with uris")
.setSmallIcon(android.R.drawable.sym_def_app_icon)
.setSmallIcon(smallIcon)
.setLargeIcon(largeIcon)
.addExtras(extras)
.build();
@@ -5141,6 +5144,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
n.visitUris(visitor);
verify(visitor, times(1)).accept(eq(audioContents));
verify(visitor, times(1)).accept(eq(backgroundImage));
verify(visitor, times(1)).accept(eq(smallIcon.getUri()));
verify(visitor, times(1)).accept(eq(largeIcon.getUri()));
verify(visitor, times(1)).accept(eq(personIcon1.getUri()));
verify(visitor, times(1)).accept(eq(personIcon2.getUri()));
verify(visitor, times(1)).accept(eq(personIcon3.getUri()));
@@ -5148,6 +5153,68 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
verify(visitor, times(1)).accept(eq(historyUri2));
}
@Test
public void testVisitUris_audioContentsString() throws Exception {
final Uri audioContents = Uri.parse("content://com.example/audio");
Bundle extras = new Bundle();
extras.putString(Notification.EXTRA_AUDIO_CONTENTS_URI, audioContents.toString());
Notification n = new Notification.Builder(mContext, "a")
.setContentTitle("notification with uris")
.setSmallIcon(android.R.drawable.sym_def_app_icon)
.addExtras(extras)
.build();
Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);
n.visitUris(visitor);
verify(visitor, times(1)).accept(eq(audioContents));
}
@Test
public void testVisitUris_messagingStyle() {
final Icon personIcon1 = Icon.createWithContentUri("content://media/person1");
final Icon personIcon2 = Icon.createWithContentUri("content://media/person2");
final Icon personIcon3 = Icon.createWithContentUri("content://media/person3");
final Person person1 = new Person.Builder()
.setName("Messaging Person 1")
.setIcon(personIcon1)
.build();
final Person person2 = new Person.Builder()
.setName("Messaging Person 2")
.setIcon(personIcon2)
.build();
final Person person3 = new Person.Builder()
.setName("Messaging Person 3")
.setIcon(personIcon3)
.build();
Icon shortcutIcon = Icon.createWithContentUri("content://media/shortcut");
Notification.Builder builder = new Notification.Builder(mContext, "a")
.setCategory(Notification.CATEGORY_MESSAGE)
.setContentTitle("new message!")
.setContentText("Conversation Notification")
.setSmallIcon(android.R.drawable.sym_def_app_icon);
Notification.MessagingStyle.Message message1 = new Notification.MessagingStyle.Message(
"Marco?", System.currentTimeMillis(), person2);
Notification.MessagingStyle.Message message2 = new Notification.MessagingStyle.Message(
"Polo!", System.currentTimeMillis(), person3);
Notification.MessagingStyle style = new Notification.MessagingStyle(person1)
.addMessage(message1)
.addMessage(message2)
.setShortcutIcon(shortcutIcon);
builder.setStyle(style);
Notification n = builder.build();
Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);
n.visitUris(visitor);
verify(visitor, times(1)).accept(eq(shortcutIcon.getUri()));
verify(visitor, times(1)).accept(eq(personIcon1.getUri()));
verify(visitor, times(1)).accept(eq(personIcon2.getUri()));
verify(visitor, times(1)).accept(eq(personIcon3.getUri()));
}
@Test
public void testVisitUris_callStyle() {
Icon personIcon = Icon.createWithContentUri("content://media/person");
@@ -5171,24 +5238,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
verify(visitor, times(1)).accept(eq(verificationIcon.getUri()));
}
@Test
public void testVisitUris_audioContentsString() throws Exception {
final Uri audioContents = Uri.parse("content://com.example/audio");
Bundle extras = new Bundle();
extras.putString(Notification.EXTRA_AUDIO_CONTENTS_URI, audioContents.toString());
Notification n = new Notification.Builder(mContext, "a")
.setContentTitle("notification with uris")
.setSmallIcon(android.R.drawable.sym_def_app_icon)
.addExtras(extras)
.build();
Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);
n.visitUris(visitor);
verify(visitor, times(1)).accept(eq(audioContents));
}
@Test
public void testSetNotificationPolicy_preP_setOldFields() {
ZenModeHelper mZenModeHelper = mock(ZenModeHelper.class);