Merge "Temporarily disable some Bubbles checks"
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index da623ae..8ea4326 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -6097,14 +6097,15 @@
}
// bubble or inline reply that's immutable?
- if (n.getBubbleMetadata() != null
+ // TODO (b/171418004): renable after app outreach
+ /*if (n.getBubbleMetadata() != null
&& n.getBubbleMetadata().getIntent() != null
&& hasFlag(mAmi.getPendingIntentFlags(
n.getBubbleMetadata().getIntent().getTarget()),
PendingIntent.FLAG_IMMUTABLE)) {
throw new IllegalArgumentException(r.getKey() + " Not posted."
+ " PendingIntents attached to bubbles must be mutable");
- }
+ }*/
if (n.actions != null) {
for (Notification.Action action : n.actions) {
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 4697d50..740505e 100755
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -7145,7 +7145,8 @@
inOrder.verify(child).recordDismissalSentiment(anyInt());
}
- @Test
+ // TODO (b/171418004): renable after app outreach
+ /*@Test
public void testImmutableBubbleIntent() throws Exception {
when(mAmi.getPendingIntentFlags(pi1))
.thenReturn(FLAG_IMMUTABLE | FLAG_ONE_SHOT);
@@ -7160,7 +7161,7 @@
} catch (IllegalArgumentException e) {
// good
}
- }
+ }*/
@Test
public void testMutableBubbleIntent() throws Exception {