From 4275a8a5ebe0d6dbcc4360809dc62ee2fb887874 Mon Sep 17 00:00:00 2001
From: Xiaowen Lei <xilei@google.com>
Date: Fri, 16 Sep 2022 22:59:39 +0000
Subject: [PATCH] Remove redundant MediaPlayerData.getMediaData(...) method.

Bug: 234639220
Test: passing existing tests
Change-Id: Icc7abc6825378599534578458e64615fae13479e
(cherry picked from commit f18bf6adef5fc0d5c6018a43cabb4978b09f6477)
Merged-In: Icc7abc6825378599534578458e64615fae13479e
---
 .../android/systemui/media/MediaCarouselController.kt | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
index cc77ed15b5f0f..654c15812988e 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
@@ -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) }
     }