Merge "Invalidate pipeline on state change" into main (3034ebdc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SensitiveContentCoordinator.kt

+7 −0

Original line number	Diff line number	Diff line
		@@ -63,9 +63,16 @@ class SensitiveContentCoordinatorImpl @Inject constructor(
		SensitiveContentCoordinator,
		DynamicPrivacyController.Listener,
		OnBeforeRenderListListener {
		private val onSensitiveStateChanged = Runnable() {
		invalidateList("onSensitiveStateChanged")
		}

		override fun attach(pipeline: NotifPipeline) {
		dynamicPrivacyController.addListener(this)
		if (screenshareNotificationHiding()) {
		sensitiveNotificationProtectionController
		.registerSensitiveStateListener(onSensitiveStateChanged)
		}
		pipeline.addOnBeforeRenderListListener(this)
		pipeline.addPreRenderInvalidator(this)
		}

+20 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,26 @@ class SensitiveContentCoordinatorTest : SysuiTestCase() {
		verify(invalidationListener).onPluggableInvalidated(eq(invalidator), any())
		}

		@Test
		@EnableFlags(FLAG_SCREENSHARE_NOTIFICATION_HIDING)
		fun onSensitiveStateChanged_invokeInvalidationListener() {
		coordinator.attach(pipeline)
		val invalidator =
		withArgCaptor<Invalidator> { verify(pipeline).addPreRenderInvalidator(capture()) }
		val onSensitiveStateChangedListener =
		withArgCaptor<Runnable> {
		verify(sensitiveNotificationProtectionController)
		.registerSensitiveStateListener(capture())
		}

		val invalidationListener = mock<Pluggable.PluggableListener<Invalidator>>()
		invalidator.setInvalidationListener(invalidationListener)

		onSensitiveStateChangedListener.run()

		verify(invalidationListener).onPluggableInvalidated(eq(invalidator), any())
		}

		@Test
		fun onBeforeRenderList_deviceUnlocked_notifDoesNotNeedRedaction() {
		coordinator.attach(pipeline)