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

Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev

Browse Source 
* changes:
  [automerge] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. 2p: 43b1711332
  Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.
This commit is contained in:
Ioana Alexandru
2023-05-04 13:18:36 +00:00
committed by Android (Google) Code Review
parent 206c83c4fe 0307b18a1a
commit 59aee8fbbb
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2807,6 +2807,17 @@ public class Notification implements Parcelable
if (person != null) { if (person != null) {
visitor.accept(person.getIconUri()); visitor.accept(person.getIconUri());
} }
final RemoteInputHistoryItem[] history = (RemoteInputHistoryItem[])
extras.getParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS);
if (history != null) {
for (int i = 0; i < history.length; i++) {
RemoteInputHistoryItem item = history[i];
if (item.getUri() != null) {
visitor.accept(item.getUri());
}
}
}
} }
if (isStyle(MessagingStyle.class) && extras != null) { if (isStyle(MessagingStyle.class) && extras != null) {

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

@@ -116,6 +116,7 @@ import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.app.Person; import android.app.Person;
import android.app.RemoteInput; import android.app.RemoteInput;
import android.app.RemoteInputHistoryItem;
import android.app.StatsManager; import android.app.StatsManager;
import android.app.admin.DevicePolicyManagerInternal; import android.app.admin.DevicePolicyManagerInternal;
import android.app.usage.UsageStatsManagerInternal; import android.app.usage.UsageStatsManagerInternal;
@@ -4428,10 +4429,36 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
public void testVisitUris() throws Exception { public void testVisitUris() throws Exception {
final Uri audioContents = Uri.parse("content://com.example/audio"); final Uri audioContents = Uri.parse("content://com.example/audio");
final Uri backgroundImage = Uri.parse("content://com.example/background"); final Uri backgroundImage = Uri.parse("content://com.example/background");
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")
.setIcon(personIcon1)
.build();
final Person person2 = new Person.Builder()
.setName("People List Person 1")
.setIcon(personIcon2)
.build();
final Person person3 = new Person.Builder()
.setName("People List Person 2")
.setIcon(personIcon3)
.build();
final Uri historyUri1 = Uri.parse("content://com.example/history1");
final Uri historyUri2 = Uri.parse("content://com.example/history2");
final RemoteInputHistoryItem historyItem1 = new RemoteInputHistoryItem(null, historyUri1,
"a");
final RemoteInputHistoryItem historyItem2 = new RemoteInputHistoryItem(null, historyUri2,
"b");
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putParcelable(Notification.EXTRA_AUDIO_CONTENTS_URI, audioContents); extras.putParcelable(Notification.EXTRA_AUDIO_CONTENTS_URI, audioContents);
extras.putString(Notification.EXTRA_BACKGROUND_IMAGE_URI, backgroundImage.toString()); extras.putString(Notification.EXTRA_BACKGROUND_IMAGE_URI, backgroundImage.toString());
extras.putParcelable(Notification.EXTRA_MESSAGING_PERSON, person1);
extras.putParcelableArrayList(Notification.EXTRA_PEOPLE_LIST,
new ArrayList<>(Arrays.asList(person2, person3)));
extras.putParcelableArray(Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS,
new RemoteInputHistoryItem[]{historyItem1, historyItem2});
Notification n = new Notification.Builder(mContext, "a") Notification n = new Notification.Builder(mContext, "a")
.setContentTitle("notification with uris") .setContentTitle("notification with uris")
@@ -4443,6 +4470,11 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
n.visitUris(visitor); n.visitUris(visitor);
verify(visitor, times(1)).accept(eq(audioContents)); verify(visitor, times(1)).accept(eq(audioContents));
verify(visitor, times(1)).accept(eq(backgroundImage)); verify(visitor, times(1)).accept(eq(backgroundImage));
verify(visitor, times(1)).accept(eq(personIcon1.getUri()));
verify(visitor, times(1)).accept(eq(personIcon2.getUri()));
verify(visitor, times(1)).accept(eq(personIcon3.getUri()));
verify(visitor, times(1)).accept(eq(historyUri1));
verify(visitor, times(1)).accept(eq(historyUri2));
} }
@Test @Test