Merge "Clean up flag notification_reentrant_dismiss" into main (954cfe91) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1794,16 +1794,6 @@ flag {
		bug: "365064144"
		}

		flag {
		name: "notification_reentrant_dismiss"
		namespace: "systemui"
		description: "Posts to avoid a crashing reentrant pipeline run"
		bug: "328328054"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "keyguard_transition_force_finish_on_screen_off"
		namespace: "systemui"

+2 −8

Original line number	Diff line number	Diff line
		@@ -1967,15 +1967,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
		mOnUserInteractionCallback, REASON_CANCEL)
		: mOnUserInteractionCallback.registerFutureDismissal(
		getEntryLegacy(), REASON_CANCEL);
		if (Flags.notificationReentrantDismiss()) {
		if (futureDismissal != null) {
		post(futureDismissal);
		}
		} else {
		if (futureDismissal != null) {
		futureDismissal.run();
		}
		}
		}
		}
		}

+0 −12

Original line number	Diff line number	Diff line
		@@ -617,18 +617,6 @@ public class ExpandableNotificationRowTest extends SysuiTestCase {
		}

		@Test
		@DisableFlags(com.android.systemui.Flags.FLAG_NOTIFICATION_REENTRANT_DISMISS)
		public void testCanDismiss_immediately() throws Exception {
		ExpandableNotificationRow row = mKosmos.createRow();
		when(mKosmos.getMockNotificationDismissibilityProvider().isDismissable(
		row.getKey()))
		.thenReturn(true);
		row.performDismiss(false);
		verify(mKosmos.getMockNotifCollection()).registerFutureDismissal(any(), anyInt(), any());
		}

		@Test
		@EnableFlags(com.android.systemui.Flags.FLAG_NOTIFICATION_REENTRANT_DISMISS)
		public void testCanDismiss() throws Exception {
		ExpandableNotificationRow row = mKosmos.createRow();
		when(mKosmos.getMockNotificationDismissibilityProvider().isDismissable(