From 94e4e37a2cb79fd5bcc37466968b82831860a817 Mon Sep 17 00:00:00 2001
From: yupanwen <yupanwen@huawei.com>
Date: Thu, 11 Sep 2025 16:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E9=94=81=E9=98=B2=E6=AD=A2=E5=B9=B6?=
 =?UTF-8?q?=E5=8F=91=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 136******92 <yupanwen@huawei.com>
Change-Id: I78e0cc5d1b94c6ed73d1762de397f096eca52f2b
---
 .../server/service/service_main/include/audio_policy_server.h | 4 +++-
 .../server/service/service_main/src/audio_policy_server.cpp   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/audio_policy/server/service/service_main/include/audio_policy_server.h b/services/audio_policy/server/service/service_main/include/audio_policy_server.h
index 32313acdbb..aad7504a05 100644
--- a/services/audio_policy/server/service/service_main/include/audio_policy_server.h
+++ b/services/audio_policy/server/service/service_main/include/audio_policy_server.h
@@ -630,7 +630,7 @@ public:
 
     int32_t SetCollaborativePlaybackEnabledForDevice(
         const std::shared_ptr<AudioDeviceDescriptor> &selectedAudioDevice, bool enabled) override;
-    
+
     int32_t IsCollaborativePlaybackEnabledForDevice(
         const std::shared_ptr<AudioDeviceDescriptor> &selectedAudioDevice, bool &enabled) override;
 
@@ -893,6 +893,8 @@ private:
     std::mutex micStateChangeMutex_;
     std::mutex clientDiedListenerStateMutex_;
     std::mutex subscribeVolumeKey_;
+    std::mutex mtxSetAudioClientInfoMgrCallback_;
+    std::mutex mtxSetAudioVKBInfoMgrCallback_;
 
     std::shared_ptr<AudioPolicyServerHandler> audioPolicyServerHandler_;
     bool volumeApplyToAll_ = false;
diff --git a/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp b/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp
index 45bbb04a5f..05b542d3c0 100644
--- a/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp
+++ b/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp
@@ -2615,6 +2615,7 @@ int32_t AudioPolicyServer::SetAudioClientInfoMgrCallback(const sptr<IRemoteObjec
         return ERR_OPERATION_FAILED;
     }
 
+    lock_guard<std::mutex> lg(mtxSetAudioClientInfoMgrCallback_);
     sptr<IStandardAudioPolicyManagerListener> callback = iface_cast<IStandardAudioPolicyManagerListener>(object);
 
     if (callback != nullptr) {
@@ -2648,6 +2649,7 @@ int32_t AudioPolicyServer::SetAudioVKBInfoMgrCallback(const sptr<IRemoteObject>
         return ERR_OPERATION_FAILED;
     }
 
+    lock_guard<std::mutex> lg(mtxSetAudioVKBInfoMgrCallback_);
     sptr<IStandardAudioPolicyManagerListener> callback = iface_cast<IStandardAudioPolicyManagerListener>(object);
 
     if (callback != nullptr) {
-- 
Gitee