diff options
| author | 2023-07-11 19:39:42 +0000 | |
|---|---|---|
| committer | 2023-07-11 19:39:42 +0000 | |
| commit | 86b379eaeca182a59a290b72826d3034249fd44c (patch) | |
| tree | d8e687ad6b52d051da3761b2b03c270b93eeb02e | |
| parent | 7a2de3e62f9c8883df8c3fe32dd6c5a75bd452b4 (diff) | |
| parent | 5ec7baf068ea7a02c4231526b69bf3415fd5d9e2 (diff) | |
Relax policy for non-dismissible calls am: 5ec7baf068
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24019388
Change-Id: Id28defb91d5c876148edcb6ca9571fa7d2e07f89
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 4bd66f2f0c95..7369e5ed5932 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 06fe9b7a458e..4849665b0c44 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") |