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

Commit e6967641 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix index error when app has extra custom actions"

parents 5a586529 8fdf47d1

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

+2 −2
Original line number Diff line number Diff line
@@ -728,9 +728,9 @@ class MediaDataManager( 
                    PlaybackState.ACTION_SKIP_TO_NEXT)



            // Then, check for custom actions

            val customActions = MutableList<MediaAction?>(4) { null }

            val customActions = MutableList<MediaAction?>(MAX_CUSTOM_ACTIONS) { null }

            var customCount = 0

            for (i in 0..MAX_CUSTOM_ACTIONS) {

            for (i in 0..(MAX_CUSTOM_ACTIONS - 1)) {

                getCustomAction(state, packageName, controller, customCount)?.let {

                    customActions[customCount++] = it

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ class MediaDataManagerTest : SysuiTestCase() { 


    @Test

    fun testPlaybackActions_noPrevNext_usesCustom() {

        val customDesc = arrayOf("custom 1", "custom 2", "custom 3", "custom 4")

        val customDesc = arrayOf("custom 1", "custom 2", "custom 3", "custom 4", "custom 5")

        whenever(mediaFlags.areMediaSessionActionsEnabled()).thenReturn(true)

        val stateActions = PlaybackState.ACTION_PLAY

        val stateBuilder = PlaybackState.Builder()