From 4335c023ca1298245edcfd9448d4e681eccd46fb Mon Sep 17 00:00:00 2001
From: Beth Thibodeau <ethibodeau@google.com>
Date: Tue, 2 Jun 2020 16:41:42 -0400
Subject: [PATCH] Fix CME in MediaDataCombineListener

Same issue as in ag/11604129

Fixes: 157858313
Test: atest SystemUITests
Change-Id: I301e22c322050605d12a2dcd2452a63fbc841f06
---
 .../com/android/systemui/media/MediaDataCombineLatest.kt    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataCombineLatest.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataCombineLatest.kt
index cce9838bb8e24..67cf21ae10b90 100644
--- 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)
             }
         }