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

Commit b9b15ebb authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf183 

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

Change-Id: I22b20787cee2e54485f972f717dd04be7066d4fb
parents f1d8f85d 475cf183

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

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ class MediaTimeoutListener @Inject constructor( 


        init {

            mediaController?.registerCallback(this)

            onPlaybackStateChanged(mediaController?.playbackState)

        }



        fun destroy() {

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

+13 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import org.mockito.Mock 
import org.mockito.Mockito

import org.mockito.Mockito.`when`

import org.mockito.Mockito.clearInvocations

import org.mockito.Mockito.mock

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.junit.MockitoJUnit
@@ -99,6 +100,10 @@ class MediaTimeoutListenerTest : SysuiTestCase() { 


    @Test

    fun testOnMediaDataLoaded_registersPlaybackListener() {

        val playingState = mock(android.media.session.PlaybackState::class.java)

        `when`(playingState.state).thenReturn(PlaybackState.STATE_PLAYING)



        `when`(mediaController.playbackState).thenReturn(playingState)

        mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData)

        verify(mediaController).registerCallback(capture(mediaCallbackCaptor))
@@ -108,6 +113,13 @@ class MediaTimeoutListenerTest : SysuiTestCase() { 
        verify(mediaController, never()).registerCallback(anyObject())

    }



    @Test

    fun testOnMediaDataLoaded_registersTimeout_whenPaused() {

        mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData)

        verify(mediaController).registerCallback(capture(mediaCallbackCaptor))

        verify(executor).executeDelayed(capture(timeoutCaptor), anyLong())

    }



    @Test

    fun testOnMediaDataRemoved_unregistersPlaybackListener() {

        mediaTimeoutListener.onMediaDataLoaded(KEY, null, mediaData)