From 6effc5568c0613f3e1fa69392d51fa41a0aa0aad Mon Sep 17 00:00:00 2001 From: libo429 Date: Thu, 28 Sep 2023 17:11:38 +0800 Subject: [PATCH] fix: modify enable param Signed-off-by: libo429 --- .../audio_source/src/daudio_source_proxy.cpp | 4 ++-- ...handlerregisterdistributedhardware_fuzzer.cpp | 4 ++-- ...ceproxyregisterdistributedhardware_fuzzer.cpp | 4 ++-- .../src/daudio_source_handler_test.cpp | 16 ++++++++-------- .../src/daudio_source_proxy_test.cpp | 8 ++++---- .../servicesource/src/daudio_source_service.cpp | 4 ++-- .../servicesource/src/daudio_source_stub.cpp | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp index 480d77f9..112eaec4 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_proxy.cpp @@ -70,8 +70,8 @@ int32_t DAudioSourceProxy::RegisterDistributedHardware(const std::string &devId, reqId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { return ERR_DH_AUDIO_SA_DEVID_ILLEGAL; } - if (!data.WriteString(devId) || !data.WriteString(dhId) || !data.WriteString(param.version) || - !data.WriteString(param.attrs) || !data.WriteString(reqId)) { + if (!data.WriteString(devId) || !data.WriteString(dhId) || !data.WriteString(param.sinkVersion) || + !data.WriteString(param.sinkAttrs) || !data.WriteString(reqId)) { return ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED; } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/sourcehandlerregisterdistributedhardware_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/sourcehandlerregisterdistributedhardware_fuzzer.cpp index 2e655cc4..10871d97 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/sourcehandlerregisterdistributedhardware_fuzzer.cpp +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/sourcehandlerregisterdistributedhardware_fuzzer.cpp @@ -34,8 +34,8 @@ void SourceHandlerRegisterDistributedHardwareFuzzTest(const uint8_t* data, size_ std::string version(reinterpret_cast(data), size); std::string attrs(reinterpret_cast(data), size); EnableParam param; - param.version = version; - param.attrs = attrs; + param.sinkVersion = version; + param.sinkAttrs = attrs; std::shared_ptr callback = std::make_shared(); DAudioSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/sourceproxyregisterdistributedhardware_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/sourceproxyregisterdistributedhardware_fuzzer.cpp index dee0069c..f15c1177 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/sourceproxyregisterdistributedhardware_fuzzer.cpp +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/sourceproxyregisterdistributedhardware_fuzzer.cpp @@ -37,8 +37,8 @@ void SourceProxyRegisterDistributedHardwareFuzzTest(const uint8_t* data, size_t std::string version(reinterpret_cast(data), size); std::string attrs(reinterpret_cast(data), size); EnableParam param; - param.version = version; - param.attrs = attrs; + param.sinkVersion = version; + param.sinkAttrs = attrs; sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_handler_test.cpp index 310c9eac..6d93ec3c 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_handler_test.cpp @@ -47,8 +47,8 @@ HWTEST_F(DAudioSourceHandlerTest, RegisterDistributedHardware_001, TestSize.Leve const std::string devId = "devId"; const std::string dhId = "dhId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::shared_ptr callback = std::make_shared(); DAudioSourceHandler::GetInstance().dAudioSourceProxy_ = new MockIDAudioSource(); int32_t ret = DAudioSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); @@ -69,8 +69,8 @@ HWTEST_F(DAudioSourceHandlerTest, RegisterDistributedHardware_002, TestSize.Leve const std::string devId = "devId"; const std::string dhId = "dhId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::shared_ptr callback = std::make_shared(); DAudioSourceHandler::GetInstance().dAudioIpcCallback_ = nullptr; DAudioSourceHandler::GetInstance().dAudioSourceProxy_ = new MockIDAudioSource(); @@ -92,8 +92,8 @@ HWTEST_F(DAudioSourceHandlerTest, RegisterDistributedHardware_003, TestSize.Leve const std::string devId = "devId"; const std::string dhId = "dhId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::shared_ptr callback = std::make_shared(); DAudioSourceHandler::GetInstance().dAudioIpcCallback_ = nullptr; DAudioSourceHandler::GetInstance().dAudioSourceProxy_ = nullptr; @@ -117,8 +117,8 @@ HWTEST_F(DAudioSourceHandlerTest, RegisterDistributedHardware_004, TestSize.Leve devId.resize(DAUDIO_MAX_DEVICE_ID_LEN); const std::string dhId = "dhId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; std::shared_ptr callback = std::make_shared(); DAudioSourceHandler::GetInstance().dAudioSourceProxy_ = new MockIDAudioSource(); DAudioSourceHandler::GetInstance().dAudioIpcCallback_ = new DAudioIpcCallback(); diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_proxy_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_proxy_test.cpp index 666160dc..80cf64e7 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_proxy_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_proxy_test.cpp @@ -57,8 +57,8 @@ HWTEST_F(DAudioSourceProxyTest, RegisterDistributedHardware_001, TestSize.Level1 const std::string dhId = "dhId"; const std::string reqId = "reqId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; int32_t ret = dAudioProxy->RegisterDistributedHardware(devId, dhId, param, reqId); EXPECT_EQ(DH_SUCCESS, ret); @@ -82,8 +82,8 @@ HWTEST_F(DAudioSourceProxyTest, RegisterDistributedHardware_002, TestSize.Level1 const std::string dhId = "dhId"; const std::string reqId = "reqId"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "attrs"; int32_t ret = dAudioProxy->RegisterDistributedHardware(devId, dhId, param, reqId); EXPECT_EQ(ERR_DH_AUDIO_SA_DEVID_ILLEGAL, ret); diff --git a/services/audiomanager/servicesource/src/daudio_source_service.cpp b/services/audiomanager/servicesource/src/daudio_source_service.cpp index ec330f19..cb2ab16f 100644 --- a/services/audiomanager/servicesource/src/daudio_source_service.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_service.cpp @@ -102,8 +102,8 @@ int32_t DAudioSourceService::RegisterDistributedHardware(const std::string &devI { DHLOGI("Register distributed audio device, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), dhId.c_str()); - std::string version = param.version; - std::string attrs = param.attrs; + std::string version = param.sinkVersion; + std::string attrs = param.sinkAttrs; return DAudioSourceManager::GetInstance().EnableDAudio(devId, dhId, version, attrs, reqId); } diff --git a/services/audiomanager/servicesource/src/daudio_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index e31b5407..a9e0364c 100644 --- a/services/audiomanager/servicesource/src/daudio_source_stub.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_stub.cpp @@ -121,8 +121,8 @@ int32_t DAudioSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, std::string attrs = data.ReadString(); std::string reqId = data.ReadString(); EnableParam enableParam; - enableParam.version = version; - enableParam.attrs = attrs; + enableParam.sinkVersion = version; + enableParam.sinkAttrs = attrs; int32_t ret = RegisterDistributedHardware(networkId, dhId, enableParam, reqId); reply.WriteInt32(ret); -- Gitee