Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2d9ca2f6d0b4e2709bfc2bb4a927b8242c43b9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Xiaowen Lei
2022-10-05 16:58:36 +00:00
committed by Automerger Merge Worker
parent 2ec01c2609 037216830b
commit d01e44a517
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
View File

@@ -449,7 +449,7 @@ class MediaCarouselController @Inject constructor(
val existingPlayer = MediaPlayerData.getMediaPlayer(key) val existingPlayer = MediaPlayerData.getMediaPlayer(key)
val curVisibleMediaKey = MediaPlayerData.playerKeys() val curVisibleMediaKey = MediaPlayerData.playerKeys()
.elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex) .elementAtOrNull(mediaCarouselScrollHandler.visibleMediaIndex)
val isCurVisibleMediaPlaying = MediaPlayerData.getMediaData(curVisibleMediaKey)?.isPlaying val isCurVisibleMediaPlaying = curVisibleMediaKey?.data?.isPlaying
if (existingPlayer == null) { if (existingPlayer == null) {
val newPlayer = mediaControlPanelFactory.get() val newPlayer = mediaControlPanelFactory.get()
newPlayer.attachPlayer(MediaViewHolder.create( 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? { fun getMediaPlayer(key: String): MediaControlPanel? {
return mediaData.get(key)?.let { mediaPlayers.get(it) } return mediaData.get(key)?.let { mediaPlayers.get(it) }
} }