From 2c10655dbc2323bc2ef0a6887b5ab0e8b0e61f98 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Fri, 8 Jan 2021 15:28:59 -0800 Subject: [PATCH] Remove foreground requirement for applying suppress notif - Some usecases the app might not be foreground, e.g. 'mark as read' via a notification Fixes: 175739832 Test: atest NotificationManagerServiceTest NotificationManagerTest Change-Id: I6ca68588f24c4f84b475569e4a8936a8e4736985 --- .../server/notification/NotificationManagerService.java | 1 - .../server/notification/NotificationManagerServiceTest.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 4ab827908e347..295911b4b7aa2 100755 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -6062,7 +6062,6 @@ public class NotificationManagerService extends SystemService { if (!isAppForeground && metadata != null) { int flags = metadata.getFlags(); flags &= ~Notification.BubbleMetadata.FLAG_AUTO_EXPAND_BUBBLE; - flags &= ~Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION; metadata.setFlags(flags); } } 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 bd622e1bb0d46..35876e4e1fdec 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -6531,9 +6531,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { Notification notif = mService.getNotificationRecord(nr.getSbn().getKey()).getNotification(); assertTrue(notif.isBubbleNotification()); - // Our flags should have failed since we're not foreground + // The flag should have failed since we're not foreground assertFalse(notif.getBubbleMetadata().getAutoExpandBubble()); - assertFalse(notif.getBubbleMetadata().isNotificationSuppressed()); } @Test