diff options
| author | 2023-07-11 21:11:42 +0000 | |
|---|---|---|
| committer | 2023-07-11 21:11:42 +0000 | |
| commit | 565a757274f6e1a2122430aa9c60cde9c24bc2e0 (patch) | |
| tree | 3831a4d8203f34acb8ffe8347c4575605c800ea5 | |
| parent | bcb6bcf6c0c9272d75f6d3987b9e556a80a0900a (diff) | |
| parent | f83d7daa07da03a7434a0e5697f3219fbaf0edce (diff) | |
Relax policy for non-dismissible calls am: 5ec7baf068 am: b0361e1411 am: f83d7daa07
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24019388
Change-Id: I1409d3bc28ba6945db24f4d8faa3387243abb169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 files changed, 1 insertions, 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 f1c0e130b2be..3325ddd58330 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -7008,7 +7008,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 30180e8f43a7..7e81ef22eb65 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -11269,7 +11269,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") |