From 96b740ff7b180e69e9a3178eedaa2ade185d7e44 Mon Sep 17 00:00:00 2001 From: byndyx Date: Fri, 26 Jan 2024 11:09:55 +0800 Subject: [PATCH] modify bug Signed-off-by: byndyx --- services/hdfaudioclient/src/distributed_audio_client.cpp | 3 +++ services/hdfaudioclient/test/unittest/audio_manager_test.cpp | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/hdfaudioclient/src/distributed_audio_client.cpp b/services/hdfaudioclient/src/distributed_audio_client.cpp index 0bba46de..e4df6a37 100644 --- a/services/hdfaudioclient/src/distributed_audio_client.cpp +++ b/services/hdfaudioclient/src/distributed_audio_client.cpp @@ -252,6 +252,9 @@ static bool AudioManagerInit() { std::lock_guard lock(g_AudioManagerContext.mtx_); + g_AudioManagerContext.adapters_.clear(); + g_AudioManagerContext.ClearDescriptors(); + sptr audioMgr = IAudioManager::Get("daudio_primary_service", false); CHECK_NULL_RETURN(audioMgr, false); g_AudioManagerContext.proxy_ = audioMgr; diff --git a/services/hdfaudioclient/test/unittest/audio_manager_test.cpp b/services/hdfaudioclient/test/unittest/audio_manager_test.cpp index 2cb3906c..4ce51c2f 100644 --- a/services/hdfaudioclient/test/unittest/audio_manager_test.cpp +++ b/services/hdfaudioclient/test/unittest/audio_manager_test.cpp @@ -53,7 +53,6 @@ HWTEST_F(AudioManagerTest, GetAllAdaptersAbnormal, TestSize.Level1) struct AudioManagerContext managerContext; int32_t size = 0; AudioAdapterDescriptor *descs = nullptr; - int32_t ret = managerContext.instance_.GetAllAdapters(nullptr, &descs, &size); EXPECT_EQ(ERR_DH_AUDIO_HDI_INVALID_PARAM, ret); ret = managerContext.instance_.GetAllAdapters(&managerContext.instance_, nullptr, &size); @@ -74,7 +73,6 @@ HWTEST_F(AudioManagerTest, LoadAdapterAbnormal, TestSize.Level1) AudioAdapterDescriptor desc = {}; AudioAdapter *adapter = nullptr; struct AudioManager *manager = nullptr; - int32_t ret = managerContext.instance_.LoadAdapter(nullptr, &desc, &adapter); EXPECT_EQ(ERR_DH_AUDIO_HDI_INVALID_PARAM, ret); ret = managerContext.instance_.LoadAdapter(&managerContext.instance_, nullptr, &adapter); -- Gitee