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

DO NOT MERGE Revert "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS." am: f9d8830e32

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

Change-Id: I8492e80999f61d9c7f37ba14ca52b02cfcbca21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ioana Alexandru
2023-07-06 13:55:34 +00:00
committed by Automerger Merge Worker
parent af247aefd6 f9d8830e32
commit 77f5e259d9
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2533,17 +2533,6 @@ public class Notification implements Parcelable
if (person != null && person.getIconUri() != null) { if (person != null && person.getIconUri() != 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 (MessagingStyle.class.equals(getNotificationStyle()) && extras != null) { if (MessagingStyle.class.equals(getNotificationStyle()) && extras != null) {

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

@@ -102,7 +102,6 @@ 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;
@@ -4313,12 +4312,6 @@ 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);
@@ -4326,8 +4319,6 @@ 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")
@@ -4345,8 +4336,6 @@ 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