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

Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 88e597d2b3 am: 99424fe5e1 am: 177faa7623

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

Change-Id: I1e4e4cf90e8a58c0796e27cb0fb8c87e4ec0a85f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioana Alexandru
2023-07-07 13:58:42 +00:00
committed by Automerger Merge Worker
parent aed7e0e6c4 177faa7623
commit 30d1344e4a
2 changed files with 29 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

@@ -2815,6 +2815,17 @@ public class Notification implements Parcelable
if (person != null) { if (person != null) {
visitor.accept(person.getIconUri()); visitor.accept(person.getIconUri());
} }
final RemoteInputHistoryItem[] history = getParcelableArrayFromBundle(extras,
Notification.EXTRA_REMOTE_INPUT_HISTORY_ITEMS, RemoteInputHistoryItem.class);
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) {

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

@@ -117,6 +117,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;
@@ -4470,6 +4471,12 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
.setName("People List Person 2") .setName("People List Person 2")
.setIcon(personIcon3) .setIcon(personIcon3)
.build(); .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);
@@ -4477,6 +4484,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
extras.putParcelable(Notification.EXTRA_MESSAGING_PERSON, person1); extras.putParcelable(Notification.EXTRA_MESSAGING_PERSON, person1);
extras.putParcelableArrayList(Notification.EXTRA_PEOPLE_LIST, extras.putParcelableArrayList(Notification.EXTRA_PEOPLE_LIST,
new ArrayList<>(Arrays.asList(person2, person3))); 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")
@@ -4485,6 +4494,13 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
.addExtras(extras) .addExtras(extras)
.build(); .build();
// Serialize and deserialize the notification to make sure nothing breaks in the process,
// since that's what will usually happen before we get to call visitUris.
Parcel parcel = Parcel.obtain();
n.writeToParcel(parcel, 0);
parcel.setDataPosition(0);
n = new Notification(parcel);
Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class); Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);
n.visitUris(visitor); n.visitUris(visitor);
verify(visitor, times(1)).accept(eq(audioContents)); verify(visitor, times(1)).accept(eq(audioContents));
@@ -4494,6 +4510,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
verify(visitor, times(1)).accept(eq(personIcon1.getUri())); verify(visitor, times(1)).accept(eq(personIcon1.getUri()));
verify(visitor, times(1)).accept(eq(personIcon2.getUri())); verify(visitor, times(1)).accept(eq(personIcon2.getUri()));
verify(visitor, times(1)).accept(eq(personIcon3.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