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

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

Merge "Fix CME in MediaDataCombineListener" into rvc-dev am: 4b389892 am: 19bd4ef0 

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

Change-Id: Ie9a929a7246c6a863dbd04590adecc6776a7c87d
parents 4c0cf680 19bd4ef0

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

+4 −2
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ class MediaDataCombineLatest @Inject constructor( 
        val (entry, device) = entries[key] ?: null to null

        if (entry != null && device != null) {

            val data = entry.copy(device = device)

            listeners.forEach {

            val listenersCopy = listeners.toSet()

            listenersCopy.forEach {

                it.onMediaDataLoaded(key, data)

            }

        }
@@ -73,7 +74,8 @@ class MediaDataCombineLatest @Inject constructor( 


    private fun remove(key: String) {

        entries.remove(key)?.let {

            listeners.forEach {

            val listenersCopy = listeners.toSet()

            listenersCopy.forEach {

                it.onMediaDataRemoved(key)

            }

        }