diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-24 16:06:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-24 16:06:01 +0000 |
| commit | c231992ac3b068c3068619550bf95203e3bc2dc2 (patch) | |
| tree | 74bec1b78387fe06d4ce0e78824f26327b4e572c | |
| parent | a4d6ee2b00b3c66932281c181b0ecdff30d3fd3e (diff) | |
| parent | 4895f71528c111271087deebd645259dff80f790 (diff) | |
Merge "Media - Don't clear unless active flag is false" into rvc-qpr-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt index 3aa37a2a927d..96ecbbcc01b2 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt @@ -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 |