Merge "Fix error from null intent" into sc-v2-dev (4d7624e9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -889,7 +889,7 @@ class MediaDataManager(
	dismissIntent = target		dismissIntent = target
	.baseAction		.baseAction
	.extras		.extras
	.getParcelable(EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY) as Intent		.getParcelable(EXTRAS_SMARTSPACE_DISMISS_INTENT_KEY) as Intent?
	}		}
	packageName(target)?.let {		packageName(target)?.let {
	return SmartspaceMediaData(target.smartspaceTargetId, isActive, true, it,		return SmartspaceMediaData(target.smartspaceTargetId, isActive, true, it,

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -404,6 +404,26 @@ class MediaDataManagerTest : SysuiTestCase() {
	eq(false))		eq(false))
	}		}

			@Test
			fun testOnSmartspaceMediaDataLoaded_hasNullIntent_callsListener() {
			val recommendationExtras = Bundle().apply {
			putString("package_name", PACKAGE_NAME)
			putParcelable("dismiss_intent", null)
			}
			whenever(mediaSmartspaceBaseAction.extras).thenReturn(recommendationExtras)
			whenever(mediaSmartspaceTarget.baseAction).thenReturn(mediaSmartspaceBaseAction)
			whenever(mediaSmartspaceTarget.iconGrid).thenReturn(listOf())

			smartspaceMediaDataProvider.onTargetsAvailable(listOf(mediaSmartspaceTarget))

			verify(listener).onSmartspaceMediaDataLoaded(
			eq(KEY_MEDIA_SMARTSPACE),
			eq(EMPTY_SMARTSPACE_MEDIA_DATA
			.copy(targetId = KEY_MEDIA_SMARTSPACE, isActive = true,
			isValid = false, dismissIntent = null)),
			eq(false))
			}

	@Test		@Test
	fun testOnSmartspaceMediaDataLoaded_hasNoneMediaTarget_notCallsListener() {		fun testOnSmartspaceMediaDataLoaded_hasNoneMediaTarget_notCallsListener() {
	smartspaceMediaDataProvider.onTargetsAvailable(listOf())		smartspaceMediaDataProvider.onTargetsAvailable(listOf())