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

Commit 8910ab95 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant MediaPlayerData.getMediaData(...) method."

parents 9414e7a2 f18bf6ad
Loading
Loading
Loading
Loading
+1 −10
Original line number Diff line number Diff line
@@ -458,7 +458,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(
@@ -1046,15 +1046,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) }
    }