From 5ec7baf068ea7a02c4231526b69bf3415fd5d9e2 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 10 Jul 2023 16:17:02 -0400 Subject: [PATCH] Relax policy for non-dismissible calls Test: NotificationManagerServiceTest Test: test app; CallStyle without ongoing flag is dismissible; CallStyle with ongoing flag is not Fixes: 290684762 Change-Id: Id617ac75595704330fc54ede9d9690eef0fa0bf0 --- .../android/server/notification/NotificationManagerService.java | 2 +- .../server/notification/NotificationManagerServiceTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 4bd66f2f0c95d..7369e5ed59320 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -7005,7 +7005,7 @@ public class NotificationManagerService extends SystemService { */ private boolean canBeNonDismissible(ApplicationInfo ai, Notification notification) { return notification.isMediaNotification() || isEnterpriseExempted(ai) - || isCallNotification(ai.packageName, ai.uid, notification) + || notification.isStyle(Notification.CallStyle.class) || isDefaultSearchSelectorPackage(ai.packageName); } 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 06fe9b7a458e8..4849665b0c444 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -11210,7 +11210,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { // Given: a call notification has the flag FLAG_ONGOING_EVENT set // feature flag: ALLOW_DISMISS_ONGOING is on mTestFlagResolver.setFlagOverride(ALLOW_DISMISS_ONGOING, true); - when(mTelecomManager.isInManagedCall()).thenReturn(true); Person person = new Person.Builder() .setName("caller")