Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e5e168c authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Fix error from null intent" into sc-v2-dev am: 4d7624e9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936109

Change-Id: I91d32c4fb2dbbd624a0fe9313c4ba5c4038b4371
parents 432f79a9 4d7624e9

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

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+20 −0
Original line number Diff line number Diff line
@@ -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())