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

Commit d01e44a5 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Remove redundant MediaPlayerData.getMediaData(...) method." into tm-qpr-dev am: 03721683 

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



Change-Id: I2d9ca2f6d0b4e2709bfc2bb4a927b8242c43b9c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ec01c26 03721683

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

+1 −10
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ class MediaCarouselController @Inject constructor( 
        val existingPlayer = MediaPlayerData.getMediaPlayer(key)

        val curVisibleMediaKey = MediaPlayerData.playerKeys()

                .elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex)

        val isCurVisibleMediaPlaying = MediaPlayerData.getMediaData(curVisibleMediaKey)?.isPlaying

        val isCurVisibleMediaPlaying = curVisibleMediaKey?.data?.isPlaying

        if (existingPlayer == null) {

            val newPlayer = mediaControlPanelFactory.get()

            newPlayer.attachPlayer(MediaViewHolder.create(
@@ -1042,15 +1042,6 @@ internal object MediaPlayerData { 
        }

    }



    fun getMediaData(mediaSortKey: MediaSortKey?): MediaData? {

        mediaData.forEach { (key, value) ->

            if (value == mediaSortKey) {

                return mediaData[key]?.data

            }

        }

        return null

    }



    fun getMediaPlayer(key: String): MediaControlPanel? {

        return mediaData.get(key)?.let { mediaPlayers.get(it) }

    }