Merge "Use media data processor methods internally" into main (4b4854d2) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImpl.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ constructor(
		private val mediaFlags: MediaFlags,
		private val mediaFilterRepository: MediaFilterRepository,
		) : MediaDataManager.Listener {
		lateinit var mediaDataManager: MediaDataManager
		lateinit var mediaDataProcessor: MediaDataProcessor

		// Ensure the field (and associated reference) isn't removed during optimization.
		@KeepForWeakReference
		@@ -279,7 +279,7 @@ constructor(
		mediaEntries.forEach { (key, data) ->
		if (mediaFilterRepository.selectedUserEntries.value.containsKey(data.instanceId)) {
		// Force updates to listeners, needed for re-activated card
		mediaDataManager.setInactive(key, timedOut = true, forceUpdate = true)
		mediaDataProcessor.setInactive(key, timedOut = true, forceUpdate = true)
		}
		}
		val smartspaceMediaData = mediaFilterRepository.smartspaceMediaData.value
		@@ -301,7 +301,7 @@ constructor(

		if (mediaFlags.isPersistentSsCardEnabled()) {
		mediaFilterRepository.setRecommendation(smartspaceMediaData.copy(isActive = false))
		mediaDataManager.setRecommendationInactive(smartspaceMediaData.targetId)
		mediaDataProcessor.setRecommendationInactive(smartspaceMediaData.targetId)
		} else {
		mediaFilterRepository.setRecommendation(
		EMPTY_SMARTSPACE_MEDIA_DATA.copy(
		@@ -309,7 +309,7 @@ constructor(
		instanceId = smartspaceMediaData.instanceId,
		)
		)
		mediaDataManager.dismissSmartspaceRecommendation(
		mediaDataProcessor.dismissSmartspaceRecommendation(
		smartspaceMediaData.targetId,
		delay = 0L,
		)

packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaCarouselInteractor.kt

+12 −7

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import com.android.systemui.media.controls.domain.resume.MediaResumeListener
		import com.android.systemui.media.controls.shared.model.MediaCommonModel
		import com.android.systemui.media.controls.shared.model.MediaDataLoadingModel
		import com.android.systemui.media.controls.shared.model.SmartspaceMediaLoadingModel
		import com.android.systemui.media.controls.util.MediaControlsRefactorFlag
		import com.android.systemui.media.controls.util.MediaFlags
		import java.io.PrintWriter
		import javax.inject.Inject
		@@ -156,12 +157,10 @@ constructor(
		mediaDataProcessor.onSessionDestroyed(key)
		}
		mediaResumeListener.setManager(this)
		mediaDataFilter.mediaDataManager = this
		mediaDataFilter.mediaDataProcessor = mediaDataProcessor
		}

		override fun setInactive(key: String, timedOut: Boolean, forceUpdate: Boolean) {
		mediaDataProcessor.setInactive(key, timedOut, forceUpdate)
		}
		override fun setInactive(key: String, timedOut: Boolean, forceUpdate: Boolean) = unsupported

		override fun onNotificationAdded(key: String, sbn: StatusBarNotification) {
		mediaDataProcessor.onNotificationAdded(key, sbn)
		@@ -207,9 +206,7 @@ constructor(
		return mediaDataProcessor.dismissSmartspaceRecommendation(key, delay)
		}

		override fun setRecommendationInactive(key: String) {
		mediaDataProcessor.setRecommendationInactive(key)
		}
		override fun setRecommendationInactive(key: String) = unsupported

		override fun onNotificationRemoved(key: String) {
		mediaDataProcessor.onNotificationRemoved(key)
		@@ -240,4 +237,12 @@ constructor(
		override fun dump(pw: PrintWriter, args: Array<out String>) {
		mediaDeviceManager.dump(pw)
		}

		companion object {
		val unsupported: Nothing
		get() =
		error(
		"Code path not supported when ${MediaControlsRefactorFlag.FLAG_NAME} is enabled"
		)
		}
		}

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ class MediaDataFilterImplTest : SysuiTestCase() {

		@Mock private lateinit var userTracker: UserTracker
		@Mock private lateinit var broadcastSender: BroadcastSender
		@Mock private lateinit var mediaDataManager: MediaDataManager
		@Mock private lateinit var mediaDataProcessor: MediaDataProcessor
		@Mock private lateinit var lockscreenUserManager: NotificationLockscreenUserManager
		@Mock private lateinit var executor: Executor
		@Mock private lateinit var smartspaceData: SmartspaceMediaData
		@@ -114,7 +114,7 @@ class MediaDataFilterImplTest : SysuiTestCase() {
		mediaFlags,
		repository,
		)
		mediaDataFilter.mediaDataManager = mediaDataManager
		mediaDataFilter.mediaDataProcessor = mediaDataProcessor

		// Start all tests as main user
		setUser(USER_MAIN)
		@@ -481,7 +481,7 @@ class MediaDataFilterImplTest : SysuiTestCase() {
		mediaDataFilter.onMediaDataLoaded(KEY, null, dataMain)
		mediaDataFilter.onSwipeToDismiss()

		verify(mediaDataManager).setInactive(eq(KEY), eq(true), eq(true))
		verify(mediaDataProcessor).setInactive(eq(KEY), eq(true), eq(true))
		}

		@Test
		@@ -846,8 +846,8 @@ class MediaDataFilterImplTest : SysuiTestCase() {
		mediaDataFilter.onSmartspaceMediaDataLoaded(SMARTSPACE_KEY, data)
		mediaDataFilter.onSwipeToDismiss()

		verify(mediaDataManager).setRecommendationInactive(eq(SMARTSPACE_KEY))
		verify(mediaDataManager, never())
		verify(mediaDataProcessor).setRecommendationInactive(eq(SMARTSPACE_KEY))
		verify(mediaDataProcessor, never())
		.dismissSmartspaceRecommendation(eq(SMARTSPACE_KEY), anyLong())
		}