mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-14 18:34:30 -05:00
96 lines
4.0 KiB
Diff
96 lines
4.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: =?UTF-8?q?Mat=C3=ADas=20Hern=C3=A1ndez?= <matiashe@google.com>
|
||
|
Date: Wed, 5 Jul 2023 13:52:21 +0200
|
||
|
Subject: [PATCH] Visit Uris added by WearableExtender
|
||
|
|
||
|
Bug: 283962802
|
||
|
Test: atest + manual (POC app now crashes on notify() as expected)
|
||
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a6f44e911f2d7204cc28c710e54f97c96231abab)
|
||
|
Merged-In: I0da18c631eb5e4844a48760c7aaedab715a0bfed
|
||
|
Change-Id: I0da18c631eb5e4844a48760c7aaedab715a0bfed
|
||
|
---
|
||
|
core/java/android/app/Notification.java | 17 +++++++++++++++-
|
||
|
.../NotificationManagerServiceTest.java | 20 +++++++++++++++++++
|
||
|
2 files changed, 36 insertions(+), 1 deletion(-)
|
||
|
|
||
|
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
|
||
|
index d8eefc3d3be4..9d0a5e93e2d8 100644
|
||
|
--- a/core/java/android/app/Notification.java
|
||
|
+++ b/core/java/android/app/Notification.java
|
||
|
@@ -1790,6 +1790,10 @@ public class Notification implements Parcelable
|
||
|
}
|
||
|
}
|
||
|
|
||
|
+ private void visitUris(@NonNull Consumer<Uri> visitor) {
|
||
|
+ visitIconUri(visitor, getIcon());
|
||
|
+ }
|
||
|
+
|
||
|
@Override
|
||
|
public Action clone() {
|
||
|
return new Action(
|
||
|
@@ -2467,7 +2471,7 @@ public class Notification implements Parcelable
|
||
|
|
||
|
if (actions != null) {
|
||
|
for (Action action : actions) {
|
||
|
- visitIconUri(visitor, action.getIcon());
|
||
|
+ action.visitUris(visitor);
|
||
|
}
|
||
|
}
|
||
|
|
||
|
@@ -2501,6 +2505,11 @@ public class Notification implements Parcelable
|
||
|
if (mBubbleMetadata != null) {
|
||
|
visitIconUri(visitor, mBubbleMetadata.getIcon());
|
||
|
}
|
||
|
+
|
||
|
+ if (extras != null && extras.containsKey(WearableExtender.EXTRA_WEARABLE_EXTENSIONS)) {
|
||
|
+ WearableExtender extender = new WearableExtender(this);
|
||
|
+ extender.visitUris(visitor);
|
||
|
+ }
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
@@ -9818,6 +9827,12 @@ public class Notification implements Parcelable
|
||
|
mFlags &= ~mask;
|
||
|
}
|
||
|
}
|
||
|
+
|
||
|
+ private void visitUris(@NonNull Consumer<Uri> visitor) {
|
||
|
+ for (Action action : mActions) {
|
||
|
+ action.visitUris(visitor);
|
||
|
+ }
|
||
|
+ }
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
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 34550bb52a52..61297cf67ee0 100755
|
||
|
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
|
||
|
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
|
||
|
@@ -3528,6 +3528,26 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
|
||
|
verify(visitor, times(1)).accept(eq(personIcon3.getUri()));
|
||
|
}
|
||
|
|
||
|
+ @Test
|
||
|
+ public void testVisitUris_wearableExtender() {
|
||
|
+ Icon actionIcon = Icon.createWithContentUri("content://media/action");
|
||
|
+ Icon wearActionIcon = Icon.createWithContentUri("content://media/wearAction");
|
||
|
+ PendingIntent intent = PendingIntent.getActivity(mContext, 0, new Intent(),
|
||
|
+ PendingIntent.FLAG_IMMUTABLE);
|
||
|
+ Notification n = new Notification.Builder(mContext, "a")
|
||
|
+ .setSmallIcon(android.R.drawable.sym_def_app_icon)
|
||
|
+ .addAction(new Notification.Action.Builder(actionIcon, "Hey!", intent).build())
|
||
|
+ .extend(new Notification.WearableExtender().addAction(
|
||
|
+ new Notification.Action.Builder(wearActionIcon, "Wear!", intent).build()))
|
||
|
+ .build();
|
||
|
+
|
||
|
+ Consumer<Uri> visitor = (Consumer<Uri>) spy(Consumer.class);
|
||
|
+ n.visitUris(visitor);
|
||
|
+
|
||
|
+ verify(visitor).accept(eq(actionIcon.getUri()));
|
||
|
+ verify(visitor).accept(eq(wearActionIcon.getUri()));
|
||
|
+ }
|
||
|
+
|
||
|
@Test
|
||
|
public void testSetNotificationPolicy_preP_setOldFields() {
|
||
|
ZenModeHelper mZenModeHelper = mock(ZenModeHelper.class);
|