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 480d77f911cde5ecc71ec0a769521715b44323cb..112eaec414d1e50b320058350e621073f189c22d 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 2e655cc4ee3aae907ccaf017b98800e3b869ec5b..10871d9783b6cbb79043c7e924e1026aff5ff4fe 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 dee0069ca2bac8fc3d724b736057936167bce4d5..f15c1177aed9fc5538d47ca28f41372c259555cd 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 310c9eac34d07bb47804b39d0ec2e3a2fe0d6e1b..6d93ec3cbbd10d98567ff582897c04b87b7e2b27 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 666160dc175bab407f7f0bcacd42e0c2acd19fa6..80cf64e7ea9aa6a9949e8a25e60e12e15d713e2e 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 ec330f19551ab6519c7e8a7fa5a9b7d6edd75355..cb2ab16f0d5c735bce8eef4e27f1ecc44bdc8977 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 e31b54076cb1456a2d057ac1aeae736caf511660..a9e0364c08805fa9bde9889e5303190fc32aedc6 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);