From bc2545b0cd5e8341e0c70b0b280329a12084478d Mon Sep 17 00:00:00 2001 From: buertianshi Date: Tue, 9 Sep 2025 11:53:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: buertianshi --- .../server/domain/device/src/audio_active_device.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/services/audio_policy/server/domain/device/src/audio_active_device.cpp b/services/audio_policy/server/domain/device/src/audio_active_device.cpp index 0f2ec3bb0a..fb3641033e 100644 --- a/services/audio_policy/server/domain/device/src/audio_active_device.cpp +++ b/services/audio_policy/server/domain/device/src/audio_active_device.cpp @@ -430,8 +430,7 @@ void AudioActiveDevice::UpdateVolumeTypeDeviceMap(std::shared_ptrnewDeviceDescs_.front() != nullptr, "Devicedesc is null"); AudioVolumeType volumeType = VolumeUtils::GetVolumeTypeFromStreamUsage(desc->rendererInfo_.streamUsage); - CHECK_AND_RETURN_LOG(!IsDeviceInVector(desc->newDeviceDescs_.front(), volumeTypeDeviceMap_[volumeType]), - "descId %{public}d is exist", desc->newDeviceDescs_.front()->deviceId_); + CHECK_AND_RETURN(!IsDeviceInVector(desc->newDeviceDescs_.front(), volumeTypeDeviceMap_[volumeType])); volumeTypeDeviceMap_[volumeType].push_back(desc->newDeviceDescs_.front()); AUDIO_INFO_LOG("volumeDeviceMap: %{public}d add deviceId %{public}d", @@ -443,9 +442,8 @@ void AudioActiveDevice::UpdateStreamUsageDeviceMap(std::shared_ptrnewDeviceDescs_.front() != nullptr, "Devicedesc is null"); - CHECK_AND_RETURN_LOG(!IsDeviceInVector(desc->newDeviceDescs_.front(), - streamUsageDeviceMap_[desc->rendererInfo_.streamUsage]), - "descId %{public}d is exist", desc->newDeviceDescs_.front()->deviceId_); + CHECK_AND_RETURN(!IsDeviceInVector(desc->newDeviceDescs_.front(), + streamUsageDeviceMap_[desc->rendererInfo_.streamUsage])); streamUsageDeviceMap_[desc->rendererInfo_.streamUsage].push_back(desc->newDeviceDescs_.front()); AUDIO_INFO_LOG("streamUsageDeviceMap: %{public}d add deviceId %{public}d", -- Gitee