From f28c429eb6ad3df1f97f0190d3a872ee0a089bab Mon Sep 17 00:00:00 2001 From: zyx0106 Date: Tue, 9 Sep 2025 10:45:17 +0800 Subject: [PATCH 1/2] fix mac address print Signed-off-by: zyx0106 --- .../server/domain/effect/src/audio_collaborative_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_policy/server/domain/effect/src/audio_collaborative_service.cpp b/services/audio_policy/server/domain/effect/src/audio_collaborative_service.cpp index 6193bee081..2d7279257c 100644 --- a/services/audio_policy/server/domain/effect/src/audio_collaborative_service.cpp +++ b/services/audio_policy/server/domain/effect/src/audio_collaborative_service.cpp @@ -108,7 +108,7 @@ bool AudioCollaborativeService::IsCollaborativePlaybackEnabledForDevice( addressToCollaborativeEnabledMap_[selectedAudioDevice->macAddress_]); return addressToCollaborativeEnabledMap_[selectedAudioDevice->macAddress_]; } - AUDIO_INFO_LOG("address %{public}s is not in map", selectedAudioDevice->macAddress_.c_str()); + AUDIO_INFO_LOG("address %{public}s is not in map", GetEncryptAddr(selectedAudioDevice->macAddress_).c_str()); return false; } -- Gitee From 88d907286397a9a8dd42ad16dd79e87313c1b08c Mon Sep 17 00:00:00 2001 From: zyx0106 Date: Wed, 10 Sep 2025 14:58:34 +0800 Subject: [PATCH 2/2] fix headmove fail after SCO Signed-off-by: zyx0106 --- .../native/audioeffect/src/audio_effect_chain_manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/native/audioeffect/src/audio_effect_chain_manager.cpp b/frameworks/native/audioeffect/src/audio_effect_chain_manager.cpp index 9e1f55cc90..1404a1a262 100644 --- a/frameworks/native/audioeffect/src/audio_effect_chain_manager.cpp +++ b/frameworks/native/audioeffect/src/audio_effect_chain_manager.cpp @@ -1316,7 +1316,8 @@ void AudioEffectChainManager::UpdateSpatializationEnabled(AudioSpatializationSta memset_s(static_cast(effectHdiInput_), sizeof(effectHdiInput_), 0, sizeof(effectHdiInput_)); if (spatializationEnabled_) { - if ((deviceType_ == DEVICE_TYPE_BLUETOOTH_A2DP) && (!btOffloadSupported_)) { + if (((deviceType_ == DEVICE_TYPE_BLUETOOTH_A2DP) || (deviceType_ == DEVICE_TYPE_BLUETOOTH_SCO)) && + (!btOffloadSupported_)) { AUDIO_INFO_LOG("A2dp-hal, enter ARM processing"); btOffloadEnabled_ = false; SetSpatializationEnabledToChains(); -- Gitee