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

Merge "Media - Don't clear unless active flag is false" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-24 16:06:01 +00:00
committed by Android (Google) Code Review
parent a4d6ee2b00 4895f71528
commit c231992ac3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,7 +174,7 @@ class MediaCarouselController @Inject constructor(
mediaManager.addListener(object : MediaDataManager.Listener { mediaManager.addListener(object : MediaDataManager.Listener {
override fun onMediaDataLoaded(key: String, oldKey: String?, data: MediaData) { override fun onMediaDataLoaded(key: String, oldKey: String?, data: MediaData) {
addOrUpdatePlayer(key, oldKey, data) addOrUpdatePlayer(key, oldKey, data)
val canRemove = data.isPlaying?.let { !it } ?: data.isClearable val canRemove = data.isPlaying?.let { !it } ?: data.isClearable && !data.active
if (canRemove && !Utils.useMediaResumption(context)) { if (canRemove && !Utils.useMediaResumption(context)) {
// This view isn't playing, let's remove this! This happens e.g when // This view isn't playing, let's remove this! This happens e.g when
// dismissing/timing out a view. We still have the data around because // dismissing/timing out a view. We still have the data around because