From fce3775e9516ae12cea03cc29775b39b484e73b0 Mon Sep 17 00:00:00 2001 From: Cecilia Date: Thu, 3 Nov 2022 05:43:39 +0000 Subject: [PATCH] Remove the Smartspace update's media filter. The surface-specific logic is now covered in the upstream, so that only the media-specific updates will be passed down. Thus, the hard-coded filter is no longer needed. Bug: 246629495 Test: Local test Change-Id: I047b55bfd5db1a03540730b9eafa90cfcd131bdc --- .../SmartspaceMediaDataProvider.kt | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataProvider.kt b/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataProvider.kt index a7ed69a9ab737..cacb3e2bbe4d3 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/models/recommendation/SmartspaceMediaDataProvider.kt @@ -29,7 +29,6 @@ class SmartspaceMediaDataProvider @Inject constructor() : BcSmartspaceDataPlugin private val smartspaceMediaTargetListeners: MutableList = mutableListOf() - private var smartspaceMediaTargets: List = listOf() override fun registerListener(smartspaceTargetListener: SmartspaceTargetListener) { smartspaceMediaTargetListeners.add(smartspaceTargetListener) @@ -41,22 +40,7 @@ class SmartspaceMediaDataProvider @Inject constructor() : BcSmartspaceDataPlugin /** Updates Smartspace data and propagates it to any listeners. */ override fun onTargetsAvailable(targets: List) { - // Filter out non-media targets. - val mediaTargets = mutableListOf() - for (target in targets) { - val smartspaceTarget = target - if (smartspaceTarget.featureType == SmartspaceTarget.FEATURE_MEDIA) { - mediaTargets.add(smartspaceTarget) - } - } - - if (!mediaTargets.isEmpty()) { - Log.d(TAG, "Forwarding Smartspace media updates $mediaTargets") - } - - smartspaceMediaTargets = mediaTargets - smartspaceMediaTargetListeners.forEach { - it.onSmartspaceTargetsUpdated(smartspaceMediaTargets) - } + Log.d(TAG, "Forwarding Smartspace updates $targets") + smartspaceMediaTargetListeners.forEach { it.onSmartspaceTargetsUpdated(targets) } } }