mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
964877bbf6
wgetb96ee4a2d1.patch -O telephony-01.patch wgetc16e6e78c1.patch -O media-01.patch wgetd5771450d7.patch -O media-02.patch wgeta1370bd00c.patch -O nn-01.patch wgetce2776f4ca.patch -O bt-01.patch wget585f583ef5.patch -O bt-02.patch wgetc9905e7968.patch -O bt-03.patch wgetc93ec045f5.patch -O bt-04.patch wget89fb17d172.patch -O bt-05.patch wget14aed2455e.patch -O bt-06.patch wgetcd438ebc52.patch -O bt-07.patch wget27e7cdc4e5.patch -O nfc-01.patch wgetdfeb4270b8.patch -O launcher-01.patch wgetb1993f6cec.patch -O native-01.patch wgetdf4a9362cd.patch -O fwb-01.patch wgetb55563bb9d.patch -O fwb-02.patch wgeta80971a281.patch -O fwb-03.patch wget7e173b4383.patch -O fwb-04.patch wget44191b1c6b.patch -O fwb-05.patch wget8dc8dfe572.patch -O fwb-06.patch wget00a4224100.patch -O av-01.patch wget21623d1f43.patch -O settings-01.patch wgetfa5ec443d9.patch -O settings-02.patch wgetba4da9c7b3.patch -O settings-03.patch Signed-off-by: Tad <tad@spotco.us>
86 lines
4.2 KiB
Diff
86 lines
4.2 KiB
Diff
From df4a9362cd39867ca7deee537934649bd6a2589f Mon Sep 17 00:00:00 2001
|
|
From: Ioana Alexandru <aioana@google.com>
|
|
Date: Mon, 3 Jul 2023 16:29:47 +0000
|
|
Subject: [PATCH] DO NOT MERGE Revert "Verify URI permissions for
|
|
EXTRA_REMOTE_INPUT_HISTORY_ITEMS."
|
|
|
|
This reverts commit 43b1711332763788c7abf05c3baa931296c45bbb.
|
|
|
|
Reason for revert: regression reported at b/289223315
|
|
|
|
Bug: 289223315
|
|
Bug: 276729064
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bdc9b977e376fb3b6047530a179d00fd77f2aec1)
|
|
Merged-In: I101938fbc51592537023345ba1e642827510981b
|
|
Change-Id: I101938fbc51592537023345ba1e642827510981b
|
|
---
|
|
core/java/android/app/Notification.java | 11 -----------
|
|
.../notification/NotificationManagerServiceTest.java | 11 -----------
|
|
2 files changed, 22 deletions(-)
|
|
|
|
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
|
|
index 8a730fb0deaa..6efb83cb3d93 100644
|
|
--- a/core/java/android/app/Notification.java
|
|
+++ b/core/java/android/app/Notification.java
|
|
@@ -2857,17 +2857,6 @@ public void visitUris(@NonNull Consumer<Uri> visitor) {
|
|
if (person != null) {
|
|
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) {
|
|
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
|
|
index 2fa14a7c93c6..718d9c50c6b2 100755
|
|
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
|
|
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
|
|
@@ -128,7 +128,6 @@
|
|
import android.app.PendingIntent;
|
|
import android.app.Person;
|
|
import android.app.RemoteInput;
|
|
-import android.app.RemoteInputHistoryItem;
|
|
import android.app.StatsManager;
|
|
import android.app.admin.DevicePolicyManagerInternal;
|
|
import android.app.usage.UsageStatsManagerInternal;
|
|
@@ -5391,12 +5390,6 @@ public void testVisitUris() throws Exception {
|
|
.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();
|
|
extras.putParcelable(Notification.EXTRA_AUDIO_CONTENTS_URI, audioContents);
|
|
@@ -5404,8 +5397,6 @@ public void testVisitUris() throws Exception {
|
|
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")
|
|
.setContentTitle("notification with uris")
|
|
@@ -5423,8 +5414,6 @@ public void testVisitUris() throws Exception {
|
|
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
|