From 3a54fb5fdd086b50f353b76259190528867d014b Mon Sep 17 00:00:00 2001 From: darkshadow Date: Sat, 6 Sep 2025 16:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9F=B3=E5=8C=BA=E5=92=8C?= =?UTF-8?q?=E7=84=A6=E7=82=B9=E6=AD=BB=E9=94=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: darkshadow --- .../domain/zone/src/audio_zone_service.cpp | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/services/audio_policy/server/domain/zone/src/audio_zone_service.cpp b/services/audio_policy/server/domain/zone/src/audio_zone_service.cpp index c9fc6a22d3..516e64fa8a 100644 --- a/services/audio_policy/server/domain/zone/src/audio_zone_service.cpp +++ b/services/audio_policy/server/domain/zone/src/audio_zone_service.cpp @@ -75,8 +75,8 @@ int32_t AudioZoneService::CreateAudioZone(const std::string &name, const AudioZo } CHECK_AND_RETURN_RET_LOG(interruptService_ != nullptr, ERROR, "interruptService_ is nullptr"); - interruptService_->CreateAudioInterruptZone(zoneId, context.focusStrategy_); } + interruptService_->CreateAudioInterruptZone(zoneId, context.focusStrategy_); AUDIO_INFO_LOG("create zone id %{public}d, name %{public}s", zoneId, name.c_str()); return zoneId; } @@ -496,10 +496,12 @@ int32_t AudioZoneService::GetSystemVolumeLevel(int32_t zoneId, AudioVolumeType v AudioZoneFocusList AudioZoneService::GetAudioInterruptForZone(int32_t zoneId) { - std::lock_guard lock(zoneMutex_); - AudioZoneFocusList interrupts; - CHECK_AND_RETURN_RET_LOG(CheckIsZoneValid(zoneId), interrupts, "zone id %{public}d is not valid", zoneId); - CHECK_AND_RETURN_RET_LOG(interruptService_ != nullptr, interrupts, "interruptService_ is nullptr"); + { + std::lock_guard lock(zoneMutex_); + AudioZoneFocusList interrupts; + CHECK_AND_RETURN_RET_LOG(CheckIsZoneValid(zoneId), interrupts, "zone id %{public}d is not valid", zoneId); + CHECK_AND_RETURN_RET_LOG(interruptService_ != nullptr, interrupts, "interruptService_ is nullptr"); + } interruptService_->GetAudioFocusInfoList(zoneId, interrupts); return interrupts; @@ -524,10 +526,12 @@ bool AudioZoneService::CheckZoneExist(int32_t zoneId) AudioZoneFocusList AudioZoneService::GetAudioInterruptForZone(int32_t zoneId, const std::string &deviceTag) { - std::lock_guard lock(zoneMutex_); - AudioZoneFocusList interrupts; - CHECK_AND_RETURN_RET_LOG(CheckIsZoneValid(zoneId), interrupts, "zone id %{public}d is not valid", zoneId); - CHECK_AND_RETURN_RET_LOG(interruptService_ != nullptr, interrupts, "interruptService_ is nullptr"); + { + std::lock_guard lock(zoneMutex_); + AudioZoneFocusList interrupts; + CHECK_AND_RETURN_RET_LOG(CheckIsZoneValid(zoneId), interrupts, "zone id %{public}d is not valid", zoneId); + CHECK_AND_RETURN_RET_LOG(interruptService_ != nullptr, interrupts, "interruptService_ is nullptr"); + } interruptService_->GetAudioFocusInfoList(zoneId, deviceTag, interrupts); return interrupts; -- Gitee