commit 75831dea2baf676b349682749466a3612f84e85d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 13 00:19:13 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Nov 13 00:19:13 2024 +0000
tree c895ba905b3e8c9b3d29f8720b86514ebe0f7ad2
parent 3d96958f6ed147e9af347387bfe7ad87ad78188f
parent 6b2d00fc7f2b60ea45b3cfc263fa69188823e2ba

Snap for 12644741 from 6b2d00fc7f2b60ea45b3cfc263fa69188823e2ba to 25Q1-release

Change-Id: I3483195d2dece0073ddadef20804a20dd4d1e4b8

src/com/android/server/telecom/CallAudioRouteController.java

diff --git a/src/com/android/server/telecom/CallAudioRouteController.java b/src/com/android/server/telecom/CallAudioRouteController.java
index bce2027..7358be8 100644
--- a/src/com/android/server/telecom/CallAudioRouteController.java
+++ b/src/com/android/server/telecom/CallAudioRouteController.java
@@ -57,6 +57,7 @@
 import com.android.server.telecom.metrics.TelecomMetricsController;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -371,7 +372,7 @@
     public void initialize() {
         mAvailableRoutes = new HashSet<>();
         mCallSupportedRoutes = new HashSet<>();
-        mBluetoothRoutes = new LinkedHashMap<>();
+        mBluetoothRoutes = Collections.synchronizedMap(new LinkedHashMap<>());
         mActiveDeviceCache = new HashMap<>();
         mActiveDeviceCache.put(AudioRoute.TYPE_BLUETOOTH_SCO, null);
         mActiveDeviceCache.put(AudioRoute.TYPE_BLUETOOTH_HA, null);