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

Commit cd3fc29f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I988eed44cd3f5f92604c627a212850142de016ec
parents 54fdfae7 c231992a

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

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ class MediaCarouselController @Inject constructor( 
        mediaManager.addListener(object : MediaDataManager.Listener {

            override fun onMediaDataLoaded(key: String, oldKey: String?, data: MediaData) {

                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)) {

                    // 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