Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix error from null intent" into sc-v2-dev

Browse Source
This commit is contained in:
Beth Thibodeau
2021-09-29 15:27:53 +00:00
committed by Android (Google) Code Review
parent 4a9d97b6ea 8803a2b7c8
commit 4d7624e923
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
View File

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

20
packages/SystemUI/tests/src/com/android/systemui/media/MediaDataManagerTest.kt
View File

@@ -404,6 +404,26 @@ class MediaDataManagerTest : SysuiTestCase() {
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
fun testOnSmartspaceMediaDataLoaded_hasNoneMediaTarget_notCallsListener() {
smartspaceMediaDataProvider.onTargetsAvailable(listOf())