Merge "[Ongoing Call] Remove #onEntryCleanUp override." into sc-v2-dev (ea6e7bea) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt

+0 −9

Original line number	Diff line number	Diff line
		@@ -108,16 +108,7 @@ class OngoingCallController @Inject constructor(
		}
		}

		// Fix for b/199600334
		override fun onEntryCleanUp(entry: NotificationEntry) {
		removeChipIfNeeded(entry)
		}

		override fun onEntryRemoved(entry: NotificationEntry, reason: Int) {
		removeChipIfNeeded(entry)
		}

		private fun removeChipIfNeeded(entry: NotificationEntry) {
		if (entry.sbn.key == callNotificationInfo?.key) {
		removeChip()
		}

+0 −12

Original line number	Diff line number	Diff line
		@@ -224,18 +224,6 @@ class OngoingCallControllerTest : SysuiTestCase() {
		verify(mockOngoingCallListener).onOngoingCallStateChanged(anyBoolean())
		}

		/** Regression test for b/201097913. */
		@Test
		fun onEntryCleanUp_callNotifAddedThenRemoved_listenerNotified() {
		val ongoingCallNotifEntry = createOngoingCallNotifEntry()
		notifCollectionListener.onEntryAdded(ongoingCallNotifEntry)
		reset(mockOngoingCallListener)

		notifCollectionListener.onEntryCleanUp(ongoingCallNotifEntry)

		verify(mockOngoingCallListener).onOngoingCallStateChanged(anyBoolean())
		}

		/** Regression test for b/188491504. */
		@Test
		fun onEntryRemoved_removedNotifHasSameKeyAsAddedNotif_listenerNotified() {