From b2367ddf411dfa5d92c9783e81091eed776c2558 Mon Sep 17 00:00:00 2001 From: zhangke Date: Sat, 13 Sep 2025 20:03:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96remote=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=82=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangke --- .../domain/volume/include/audio_adapter_manager.h | 2 +- .../volume/include/audio_adapter_manager_handler.h | 6 +++--- .../domain/volume/include/iaudio_policy_interface.h | 1 - .../server/domain/volume/src/audio_adapter_manager.cpp | 10 ++++++---- .../volume/src/audio_adapter_manager_handler.cpp | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/services/audio_policy/server/domain/volume/include/audio_adapter_manager.h b/services/audio_policy/server/domain/volume/include/audio_adapter_manager.h index 8645206c88..f524db347f 100644 --- a/services/audio_policy/server/domain/volume/include/audio_adapter_manager.h +++ b/services/audio_policy/server/domain/volume/include/audio_adapter_manager.h @@ -259,7 +259,7 @@ public: void HandleSaveVolume(DeviceType deviceType, AudioStreamType streamType, int32_t volumeLevel, std::string networkId); - void HandleStreamMuteStatus(AudioStreamType streamType, bool mute, StreamUsage streamUsage = STREAM_USAGE_UNKNOWN, + void HandleStreamMuteStatus(AudioStreamType streamType, bool mute, const DeviceType &deviceType = DEVICE_TYPE_NONE, std::string networkId = LOCAL_NETWORK_ID); void HandleRingerMode(AudioRingerMode ringerMode); diff --git a/services/audio_policy/server/domain/volume/include/audio_adapter_manager_handler.h b/services/audio_policy/server/domain/volume/include/audio_adapter_manager_handler.h index 8fd66887f2..d017676ac9 100644 --- a/services/audio_policy/server/domain/volume/include/audio_adapter_manager_handler.h +++ b/services/audio_policy/server/domain/volume/include/audio_adapter_manager_handler.h @@ -56,9 +56,9 @@ public: struct StreamMuteStatusEvent { StreamMuteStatusEvent() = delete; - StreamMuteStatusEvent(const AudioStreamType &streamType, const bool &mute, const StreamUsage &streamUsage, + StreamMuteStatusEvent(const AudioStreamType &streamType, const bool &mute, const DeviceType &deviceType, const std::string &networkId) : streamType_(streamType), mute_(mute), - streamUsage_(streamUsage), deviceType_(deviceType), networkId_(networkId) + deviceType_(deviceType), networkId_(networkId) {} AudioStreamType streamType_; bool mute_; @@ -79,7 +79,7 @@ public: bool SendSaveVolume(const DeviceType &deviceType, const AudioStreamType &streamType, const int32_t &volumeLevel, std::string networkId = "LocalDevice"); bool SendStreamMuteStatusUpdate(const AudioStreamType &streamType, const bool &mute, - const StreamUsage &streamUsage, const DeviceType &deviceType = DEVICE_TYPE_NONE, + const DeviceType &deviceType = DEVICE_TYPE_NONE, std::string networkId = LOCAL_NETWORK_ID); bool SendRingerModeUpdate(const AudioRingerMode &ringerMode); diff --git a/services/audio_policy/server/domain/volume/include/iaudio_policy_interface.h b/services/audio_policy/server/domain/volume/include/iaudio_policy_interface.h index 0f50e6eae4..1360c1aebf 100644 --- a/services/audio_policy/server/domain/volume/include/iaudio_policy_interface.h +++ b/services/audio_policy/server/domain/volume/include/iaudio_policy_interface.h @@ -210,7 +210,6 @@ public: std::string networkId) = 0; virtual void HandleStreamMuteStatus(AudioStreamType streamType, bool mute, - StreamUsage streamUsage = STREAM_USAGE_UNKNOWN, const DeviceType &deviceType = DEVICE_TYPE_NONE, std::string networkId = LOCAL_NETWORK_ID) = 0; diff --git a/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp index ed91ed14e9..afb6a85240 100644 --- a/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp @@ -653,7 +653,7 @@ void AudioAdapterManager::HandleSaveVolume(DeviceType deviceType, AudioStreamTyp volumeDataMaintainer_.SaveVolume(deviceType, streamType, volumeLevel, networkId); } -void AudioAdapterManager::HandleStreamMuteStatus(AudioStreamType streamType, bool mute, StreamUsage streamUsage, +void AudioAdapterManager::HandleStreamMuteStatus(AudioStreamType streamType, bool mute, const DeviceType &deviceType, std::string networkId) { if (deviceType != DEVICE_TYPE_NONE) { @@ -2397,9 +2397,11 @@ void AudioAdapterManager::ResetRemoteCastDeviceVolume() for (auto &streamType: defaultVolumeTypeList_) { AudioStreamType streamAlias = VolumeUtils::GetVolumeTypeFromStreamType(streamType); int32_t volumeLevel = GetMaxVolumeLevel(streamAlias); - volumeDataMaintainer_.SaveVolume(DEVICE_TYPE_REMOTE_CAST, streamType, volumeLevel); - if (streamType != STREAM_RING) { - volumeDataMaintainer_.SaveMuteStatus(DEVICE_TYPE_REMOTE_CAST, streamType, false); + if (handler_ != nullptr) { + handler_->SendSaveVolume(DEVICE_TYPE_REMOTE_CAST, streamType, volumeLevel, LOCAL_NETWORK_ID); + if (streamType != STREAM_RING) { + handler_->SendStreamMuteStatusUpdate(streamType, false, DEVICE_TYPE_REMOTE_CAST, LOCAL_NETWORK_ID); + } } } } diff --git a/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp b/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp index 7d538c4074..5cf4de994e 100644 --- a/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp @@ -109,7 +109,7 @@ void AudioAdapterManagerHandler::HandleUpdateStreamMuteStatus(const AppExecFwk:: std::shared_ptr eventContextObj = event->GetSharedObject(); CHECK_AND_RETURN_LOG(eventContextObj != nullptr, "EventContextObj get nullptr"); AudioPolicyManagerFactory::GetAudioPolicyManager().HandleStreamMuteStatus(eventContextObj->streamType_, - eventContextObj->mute_, eventContextObj->streamUsage_, eventContextObj->deviceType_, + eventContextObj->mute_, eventContextObj->deviceType_, eventContextObj->networkId_); } -- Gitee From 688175c2916a69c26349826dab27c2c40aa3d9c5 Mon Sep 17 00:00:00 2001 From: zhangke Date: Sat, 13 Sep 2025 20:13:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96remote=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=82=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangke --- .../domain/volume/src/audio_adapter_manager_handler.cpp | 2 +- .../src/audio_adapter_manager_unit_test.cpp | 6 ++---- .../audio_adapter_manager_fuzzer.cpp | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp b/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp index 5cf4de994e..9d2d349021 100644 --- a/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp @@ -68,7 +68,7 @@ bool AudioAdapterManagerHandler::SendStreamMuteStatusUpdate(const AudioStreamTyp { bool ret = true; #ifndef TEST_COVERAGE - auto eventContextObj = std::make_shared(streamType, mute, streamUsage, + auto eventContextObj = std::make_shared(streamType, mute, deviceType, networkId); lock_guard runnerlock(runnerMutex_); ret = SendEvent(AppExecFwk::InnerEvent::Get(EventAdapterManagerServerCmd::STREAM_MUTE_STATUS_UPDATE, diff --git a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp index 0b4b6ee21b..864043444d 100644 --- a/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_adapter_manager_unit_test/src/audio_adapter_manager_unit_test.cpp @@ -111,9 +111,8 @@ HWTEST_F(AudioAdapterManagerUnitTest, HandleStreamMuteStatus_001, TestSize.Level { AudioStreamType streamType = STREAM_MUSIC; bool mute = true; - StreamUsage streamUsage = STREAM_USAGE_UNKNOWN; DeviceType deviceType = DEVICE_TYPE_BLUETOOTH_A2DP; - AudioAdapterManager::GetInstance().HandleStreamMuteStatus(streamType, mute, streamUsage, deviceType); + AudioAdapterManager::GetInstance().HandleStreamMuteStatus(streamType, mute, deviceType); EXPECT_TRUE(mute); } @@ -127,9 +126,8 @@ HWTEST_F(AudioAdapterManagerUnitTest, HandleStreamMuteStatus_002, TestSize.Level { AudioStreamType streamType = STREAM_MUSIC; bool mute = true; - StreamUsage streamUsage = STREAM_USAGE_UNKNOWN; DeviceType deviceType = DEVICE_TYPE_NONE; - AudioAdapterManager::GetInstance().HandleStreamMuteStatus(streamType, mute, streamUsage, deviceType); + AudioAdapterManager::GetInstance().HandleStreamMuteStatus(streamType, mute, deviceType); EXPECT_TRUE(mute); } diff --git a/test/fuzztest/audioadaptermanager_fuzzer/audio_adapter_manager_fuzzer.cpp b/test/fuzztest/audioadaptermanager_fuzzer/audio_adapter_manager_fuzzer.cpp index 488f2e5d38..051c95674f 100644 --- a/test/fuzztest/audioadaptermanager_fuzzer/audio_adapter_manager_fuzzer.cpp +++ b/test/fuzztest/audioadaptermanager_fuzzer/audio_adapter_manager_fuzzer.cpp @@ -161,9 +161,8 @@ void AudioVolumeManagerHandleStreamMuteStatusFuzzTest(const uint8_t *rawData, si uint32_t index = static_cast(size); AudioStreamType streamType = g_testAudioStreamTypes[index % g_testAudioStreamTypes.size()]; bool mute = static_cast(static_cast(size) % NUM_2); - StreamUsage streamUsage = g_testStreamUsages[index % g_testStreamUsages.size()]; DeviceType deviceType = g_testDeviceTypes[index % g_testDeviceTypes.size()]; - AudioAdapterManager::GetInstance().HandleStreamMuteStatus(streamType, mute, streamUsage, deviceType); + AudioAdapterManager::GetInstance().HandleStreamMuteStatus(streamType, mute, deviceType); } void AudioVolumeManagerSetOffloadVolumeFuzzTest(const uint8_t *rawData, size_t size) -- Gitee From 15e0094767ceb303bcdf17a9cbaed52da896bc68 Mon Sep 17 00:00:00 2001 From: zhangke Date: Sat, 13 Sep 2025 20:31:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96remote=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=82=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangke --- .../server/domain/volume/src/audio_adapter_manager_handler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp b/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp index 9d2d349021..2a9a7ebfcf 100644 --- a/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_adapter_manager_handler.cpp @@ -64,7 +64,7 @@ bool AudioAdapterManagerHandler::SendSaveVolume(const DeviceType &deviceType, } bool AudioAdapterManagerHandler::SendStreamMuteStatusUpdate(const AudioStreamType &streamType, const bool &mute, - const StreamUsage &streamUsage, const DeviceType &deviceType, std::string networkId) + const DeviceType &deviceType, std::string networkId) { bool ret = true; #ifndef TEST_COVERAGE -- Gitee From 31c28c044dc9392dd8861280ec260ab89f408699 Mon Sep 17 00:00:00 2001 From: zhangke Date: Sat, 13 Sep 2025 20:54:37 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96remote=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=82=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangke --- .../server/domain/volume/src/audio_adapter_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp index afb6a85240..11359aa11b 100644 --- a/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp @@ -956,7 +956,7 @@ int32_t AudioAdapterManager::SetStreamMuteInternal(std::shared_ptrGetKey()]->SetStreamMuteStatus(streamType, mute); if (handler_ != nullptr) { - handler_->SendStreamMuteStatusUpdate(streamType, mute, streamUsage, deviceType, device->networkId_); + handler_->SendStreamMuteStatusUpdate(streamType, mute, deviceType, device->networkId_); } return SetVolumeDb(device, streamType); } -- Gitee From 670d8a57c38885661896267a9bd7d9df79ba2ab2 Mon Sep 17 00:00:00 2001 From: zhangke Date: Sat, 13 Sep 2025 21:21:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96remote=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=82=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangke --- .../server/domain/volume/src/audio_adapter_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp index 11359aa11b..ff93f544aa 100644 --- a/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp @@ -1023,7 +1023,7 @@ int32_t AudioAdapterManager::SetStreamMuteInternal(AudioStreamType streamType, b volumeDataMaintainer_.SaveMuteStatusWithDatabaseVolumeName( currentActiveDevice_.volumeBehavior_.databaseVolumeName, streamType, mute); } else if (handler_ != nullptr) { - handler_->SendStreamMuteStatusUpdate(streamType, mute, streamUsage, deviceType, networkId); + handler_->SendStreamMuteStatusUpdate(streamType, mute, deviceType, networkId); } // Achieve the purpose of adjusting the mute status by adjusting the stream volume. -- Gitee