Merge "Fix CME in MediaDataCombineListener" into rvc-dev

2020-06-02 22:30:39 +00:00
parent e60e6524b4 4335c023ca
commit 4b389892f3
1 changed files with 4 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/media/MediaDataCombineLatest.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataCombineLatest.kt
@@ -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)
            }
        }