diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt index a487b1d295bc6..71389f55d360b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt @@ -195,7 +195,7 @@ class MediaTttChipControllerSender @Inject constructor( ) } - override fun removeView(removalReason: String) { + override fun shouldIgnoreViewRemoval(removalReason: String): Boolean { // Don't remove the chip if we're in progress or succeeded, since the user should still be // able to see the status of the transfer. (But do remove it if it's finally timed out.) val transferStatus = info?.state?.transferStatus @@ -207,9 +207,9 @@ class MediaTttChipControllerSender @Inject constructor( logger.logRemovalBypass( removalReason, bypassReason = "transferStatus=${transferStatus.name}" ) - return + return true } - super.removeView(removalReason) + return false } private fun Boolean.visibleIfTrue(): Int { diff --git a/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt b/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt index a52e2aff52c18..dc9a683c83c2a 100644 --- a/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt +++ b/packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt @@ -167,7 +167,11 @@ abstract class TemporaryViewDisplayController