Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86b379ea authored Jul 11, 2023 by Julia Reynolds Committed by Automerger Merge Worker Jul 11, 2023

Relax policy for non-dismissible calls am: 5ec7baf0

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>

parents 7a2de3e6 5ec7baf0

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7005,7 +7005,7 @@ public class NotificationManagerService extends SystemService {
	*/		*/
	private boolean canBeNonDismissible(ApplicationInfo ai, Notification notification) {		private boolean canBeNonDismissible(ApplicationInfo ai, Notification notification) {
	return notification.isMediaNotification() \|\| isEnterpriseExempted(ai)		return notification.isMediaNotification() \|\| isEnterpriseExempted(ai)
	\|\| isCallNotification(ai.packageName, ai.uid, notification)		\|\| notification.isStyle(Notification.CallStyle.class)
	\|\| isDefaultSearchSelectorPackage(ai.packageName);		\|\| isDefaultSearchSelectorPackage(ai.packageName);
	}		}

services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11210,7 +11210,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
	// Given: a call notification has the flag FLAG_ONGOING_EVENT set		// Given: a call notification has the flag FLAG_ONGOING_EVENT set
	// feature flag: ALLOW_DISMISS_ONGOING is on		// feature flag: ALLOW_DISMISS_ONGOING is on
	mTestFlagResolver.setFlagOverride(ALLOW_DISMISS_ONGOING, true);		mTestFlagResolver.setFlagOverride(ALLOW_DISMISS_ONGOING, true);
	when(mTelecomManager.isInManagedCall()).thenReturn(true);

	Person person = new Person.Builder()		Person person = new Person.Builder()
	.setName("caller")		.setName("caller")