commit 0ff11d11c9b1b5bda0d3ef868c22f58b7fab72bd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 31 22:10:54 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 31 22:10:54 2024 +0000
tree 445bd042b6d6266b3e0e318513cd41e6a7b9bf8d
parent 1b0670b2b3e791d53ef6c6ffaab71379ecd2ff56
parent f819003998de220216abf30f03d42d9c0abebbbd

Merge "Import translations. DO NOT MERGE ANYWHERE" into main

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

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index 07ecc11..a2998fb 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -2777,7 +2777,9 @@
                                     "updateCall: (deferred) Sending call disconnected update "
                                             + "to BT ICS.");
                             updateCallToIcs(inCallService, info, parcelableCall, componentName);
-                            mDisconnectedToneBtFutures.remove(call.getId());
+                            synchronized (mLock) {
+                                mDisconnectedToneBtFutures.remove(call.getId());
+                            }
                         });
                         mDisconnectedToneBtFutures.put(call.getId(), disconnectedToneFuture);
                     } else {