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

Commit 6c4a1d00 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Do not extend timeout if not playing 

Before, we'd always extend the timeout upon media state updates,
this means that going from STOPPED to PAUSED would reset the timeout.
This is not desirable.

Test: atest MediaTimeoutListenerTest
Bug: 157587326
Change-Id: Ie06904c90561e6c2bd23c0c7f4df76c2b597d899
parent cf7f7ca7

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

+5 −1
Original line number Diff line number Diff line
@@ -87,12 +87,15 @@ class MediaTimeoutListener @Inject constructor( 
            if (DEBUG) {

                Log.v(TAG, "onPlaybackStateChanged: $state")

            }

            expireMediaTimeout(key, "playback state ativity - $state, $key")



            if (state == null || !isPlayingState(state.state)) {

                if (DEBUG) {

                    Log.v(TAG, "schedule timeout for $key")

                }

                if (cancellation != null) {

                    if (DEBUG) Log.d(TAG, "cancellation already exists, continuing.")

                    return

                }

                expireMediaTimeout(key, "PLAYBACK STATE CHANGED - $state")

                cancellation = mainExecutor.executeDelayed({

                    cancellation = null
@@ -103,6 +106,7 @@ class MediaTimeoutListener @Inject constructor( 
                    timeoutCallback(key, timedOut)

                }, PAUSED_MEDIA_TIMEOUT)

            } else {

                expireMediaTimeout(key, "playback started - $state, $key")

                timedOut = false

                timeoutCallback(key, timedOut)

            }

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

+12 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class MediaTimeoutListenerTest : SysuiTestCase() { 


    @Test

    fun testOnPlaybackStateChanged_cancelsTimeout_whenResumed() {

        // Assuming we're have a pending timeout

        // Assuming we have a pending timeout

        testOnPlaybackStateChanged_schedulesTimeout_whenPaused()



        mediaCallbackCaptor.value.onPlaybackStateChanged(PlaybackState.Builder()
@@ -139,6 +139,17 @@ class MediaTimeoutListenerTest : SysuiTestCase() { 
        verify(cancellationRunnable).run()

    }



    @Test

    fun testOnPlaybackStateChanged_reusesTimeout_whenNotPlaying() {

        // Assuming we have a pending timeout

        testOnPlaybackStateChanged_schedulesTimeout_whenPaused()



        clearInvocations(cancellationRunnable)

        mediaCallbackCaptor.value.onPlaybackStateChanged(PlaybackState.Builder()

                .setState(PlaybackState.STATE_STOPPED, 0L, 0f).build())

        verify(cancellationRunnable, never()).run()

    }



    @Test

    fun testTimeoutCallback_invokedIfTimeout() {

        // Assuming we're have a pending timeout