commit d34134b270f7408550e8b7d0dc576e068f48de00
author Felix Oghina <hackz@google.com> Tue Sep 26 16:27:20 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 26 16:27:20 2023 +0000
tree b4634ea3cad3a169e6a0091f4e8320c2f32f8ae0
parent bc9258bb74acb02dc072e9775f99ab9c7f510738
parent 409a2404624ab643c99ae4f8857e9d0b9c2da448

Merge "[speech] copy client list to prevent concurrency" into main

services/core/java/com/android/server/speech/RemoteSpeechRecognitionService.java

diff --git a/services/core/java/com/android/server/speech/RemoteSpeechRecognitionService.java b/services/core/java/com/android/server/speech/RemoteSpeechRecognitionService.java
index 96f4a01..c2666f6 100644
--- a/services/core/java/com/android/server/speech/RemoteSpeechRecognitionService.java
+++ b/services/core/java/com/android/server/speech/RemoteSpeechRecognitionService.java
@@ -297,7 +297,8 @@
                     return;
                 }
 
-                for (ClientState clientState : mClients.values()) {
+
+                for (ClientState clientState : mClients.values().toArray(new ClientState[0])) {
                     tryRespondWithError(
                             clientState.mDelegatingListener.mRemoteListener,
                             SpeechRecognizer.ERROR_SERVER_DISCONNECTED);