diff --git a/interfaces/inner_kits/native_cpp/BUILD.gn b/interfaces/inner_kits/native_cpp/BUILD.gn index 2068a5585b19c581039241a6e5110ae529ed7035..aa7902c76113099da0b30813e9aaf14a7ca33e92 100644 --- a/interfaces/inner_kits/native_cpp/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/BUILD.gn @@ -153,6 +153,9 @@ if (defined(ohos_lite)) { branch_protector_ret = "pac_ret" sanitize = { + cfi = true + cfi_cross_dso = true + debug = false boundary_sanitize = true integer_overflow = true ubsan = true @@ -188,6 +191,7 @@ if (defined(ohos_lite)) { "src/ipc/standard/ipc_client_stub.cpp", "src/ipc/standard/ipc_cmd_parser.cpp", "src/notify/device_manager_notify.cpp", + "${devicemanager_path}/interfaces/inner_kits/native_cpp/src/ipc/standard/device_manager_notify_service.cpp", ] public_configs = [ ":devicemanagersdk_config" ] @@ -200,7 +204,10 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004111", ] - deps = [ "${json_path}:devicemanagerjson" ] + deps = [ + "${json_path}:devicemanagerjson", + "${devicemanager_path}/services/service:device_manager_ipc", + ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/interfaces/inner_kits/native_cpp/include/ipc/standard/device_manager_notify_service.h b/interfaces/inner_kits/native_cpp/include/ipc/standard/device_manager_notify_service.h new file mode 100644 index 0000000000000000000000000000000000000000..65f759cfc0823b7e72799ba01842fca5e7baa875 --- /dev/null +++ b/interfaces/inner_kits/native_cpp/include/ipc/standard/device_manager_notify_service.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + #ifndef DEVICE_MANAGER_NOTIFY_SERVICE_H + #define DEVICE_MANAGER_NOTIFY_SERVICE_H + #include "device_manager_ipc_stub.h" + namespace OHOS { + namespace DistributedHardware { + class DeviceManagerNotifyService : public DeviceManagerIpcStub { + public: + DeviceManagerNotifyService() = default; + ~DeviceManagerNotifyService() = default; + ErrCode ServerPublishFinish( + const std::string &pkgName, + int32_t publishId, + int32_t publishResult); + }; + + } + } + #endif // DEVICE_MANAGER_NOTIFY_SERVICE_H \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_manager.h b/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_manager.h index ef49a67ea933013c0a5c8f55e7280b4746c2f513..d62dc534386ff8e3a56b61947c05cdf9c3f41aec 100644 --- a/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_manager.h +++ b/interfaces/inner_kits/native_cpp/include/ipc/standard/ipc_client_manager.h @@ -19,7 +19,7 @@ #include "ipc_client.h" #include "ipc_client_stub.h" #include "system_ability_status_change_stub.h" - +#include "idevice_manager_ipc.h" namespace OHOS { namespace DistributedHardware { class DmDeathRecipient : public IRemoteObject::DeathRecipient { @@ -70,7 +70,7 @@ private: void SubscribeDMSAChangeListener(); private: std::mutex lock_; - std::map> dmListener_; + std::map> dmListener_; sptr dmInterface_ { nullptr }; sptr dmRecipient_ { nullptr }; std::atomic isSubscribeDMSAChangeListener = false; diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/device_manager_notify_service.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/device_manager_notify_service.cpp new file mode 100644 index 0000000000000000000000000000000000000000..88656f78c1746920174d05441b4fa0afcbe0b03c --- /dev/null +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/device_manager_notify_service.cpp @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include "device_manager_notify_service.h" +#include "dm_log.h" +namespace OHOS { +namespace DistributedHardware { +ErrCode DeviceManagerNotifyService::ServerPublishFinish( + const std::string &pkgName, + int32_t publishId, + int32_t publishResult) +{ + LOGI("DM IDL DMNS::ServerPublishFinish : pkgName: %{public}s, publishId: %{public}d, publishResult: %{public}d", + pkgName.c_str(), publishResult, publishResult); + return 0; +} +} +} \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp index f912db8d9b4b7a98b7e23f8ff8101002f7bfa4fc..a8034ba9f2a62f21c18740ebfd61abced8414eb9 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_client_manager.cpp @@ -31,7 +31,8 @@ #include "iservice_registry.h" #include "system_ability_definition.h" #include - +#include "idevice_manager_ipc.h" +#include "foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include/ipc/standard/device_manager_notify_service.h" namespace OHOS { namespace DistributedHardware { void DmDeathRecipient::OnRemoteDied(const wptr &remote) @@ -85,11 +86,12 @@ int32_t IpcClientManager::Init(const std::string &pkgName) return ret; } - sptr listener = sptr(new IpcClientStub()); + //sptr listener = sptr(new IpcClientStub()); + sptr listener = sptr(new (std::nothrow) DeviceManagerNotifyService()); std::shared_ptr req = std::make_shared(); std::shared_ptr rsp = std::make_shared(); req->SetPkgName(pkgName); - req->SetListener(listener); + req->SetListener(listener->AsObject()); ret = dmInterface_->SendCmd(REGISTER_DEVICE_MANAGER_LISTENER, req, rsp); if (ret != DM_OK) { LOGE("InitDeviceManager: RegisterDeviceManagerListener Failed with ret %{public}d", ret); @@ -100,6 +102,9 @@ int32_t IpcClientManager::Init(const std::string &pkgName) return ret; } dmListener_[pkgName] = listener; + // 打印 dmListener_ 的内容和地址 + LOGI("dmListener_ updated: pkgName = %{public}s, listener address = 0x%lx", + pkgName.c_str(), static_cast(reinterpret_cast(listener.GetRefPtr()))); LOGI("completed, pkgName: %{public}s", pkgName.c_str()); return DM_OK; } diff --git a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp index a2e7cb3e1d9bf52842b98f1cce37635edd855e0d..aa3929e6ca48718205543dc271d93f866dc7b21d 100644 --- a/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp +++ b/interfaces/inner_kits/native_cpp/src/ipc/standard/ipc_cmd_parser.cpp @@ -117,6 +117,8 @@ ON_IPC_SET_REQUEST(REGISTER_DEVICE_MANAGER_LISTENER, std::shared_ptr pBa LOGE("write listener failed"); return ERR_DM_IPC_WRITE_FAILED; } + LOGI("Listener successfully written to MessageParcel. pkgName: %{public}s, listener address: 0x%lx", + pkgName.c_str(), static_cast(reinterpret_cast(listener.GetRefPtr()))); return DM_OK; } diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 8f1711c48ddf429198c46d31baad4c813d0ac3a5..734ba62f9df9b56e018e220284b52ae2d0cbe265 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -15,6 +15,7 @@ if (defined(ohos_lite)) { import("//build/lite/config/component/lite_component.gni") } else { import("//build/ohos.gni") + import("//build/config/components/idl_tool/idl.gni") } import("//foundation/distributedhardware/device_manager/device_manager.gni") @@ -126,6 +127,32 @@ if (defined(ohos_lite)) { deps = [] } } else { +idl_gen_interface("device_manager_interface") { +src_idl = rebase_path("IDeviceManagerIpc.idl") +log_tag = "devicemanagerservice" +log_domainid = "0xD004110" +} + +ohos_source_set("device_manager_ipc") { +sanitize = { + debug = false + cfi = true + cfi_cross_dso = true +} +output_values = get_target_outputs(":device_manager_interface") +sources = [] +sources += filter_include(output_values, [ "*.cpp" ]) +public_configs = [ ":devicemanagerservice_config" ] +deps = [ ":device_manager_interface" ] +external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "hitrace:hitrace_meter", + "ipc:ipc_core", +] +subsystem_name = "distributedhardware" +part_name = "device_manager" +} config("devicemanagerservice_config") { include_dirs = [ "include", @@ -156,6 +183,7 @@ if (defined(ohos_lite)) { "${utils_path}/include/kvadapter", "${utils_path}/include/timer", "${json_path}/include", + "${target_gen_dir}", ] } config("cflags_config") { @@ -235,9 +263,11 @@ if (defined(ohos_lite)) { "HI_LOG_ENABLE", "DH_LOG_TAG=\"devicemanagerservice\"", "LOG_DOMAIN=0xD004110", + "private = public", ] deps = [ + ":device_manager_ipc", "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", "${innerkits_path}/native_cpp:devicemanagersdk", @@ -376,11 +406,13 @@ if (defined(ohos_lite)) { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"devicemanagerservice\"", + "DH_LOG_TAG=\"devicemanagerserviceIpc\"", "LOG_DOMAIN=0xD004110", + "private = public", ] deps = [ + ":device_manager_ipc", "${devicemanager_path}/commondependency:devicemanagerdependency", "${devicemanager_path}/radar:devicemanagerradar", "${innerkits_path}/native_cpp:devicemanagersdk", diff --git a/services/service/IDeviceManagerIpc.idl b/services/service/IDeviceManagerIpc.idl new file mode 100644 index 0000000000000000000000000000000000000000..13bcc9965a2bbb7aacadb17e2b290988062b005a --- /dev/null +++ b/services/service/IDeviceManagerIpc.idl @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +interface OHOS.DistributedHardware.IDeviceManagerIpc { +[ipccode 17] void ServerPublishFinish([in] String pkgName, [in] int publishId, [in] int publishResult); +} \ No newline at end of file diff --git a/services/service/include/device_manager_service_listener.h b/services/service/include/device_manager_service_listener.h index c6b9128b6d27389805d67f6422ed776f0485286b..f9ff8829a84f6259de2f61e04e8ab8aa6935a6ea 100644 --- a/services/service/include/device_manager_service_listener.h +++ b/services/service/include/device_manager_service_listener.h @@ -33,12 +33,12 @@ #include "ipc_server_listener.h" #endif #include "ipc_notify_device_state_req.h" - +#include "idevice_manager_ipc.h" namespace OHOS { namespace DistributedHardware { class DM_EXPORT DeviceManagerServiceListener : public IDeviceManagerServiceListener { public: - DeviceManagerServiceListener() {}; + DeviceManagerServiceListener(); virtual ~DeviceManagerServiceListener() {}; void OnDeviceStateChange(const ProcessInfo &processInfo, const DmDeviceState &state, diff --git a/services/service/include/ipc/standard/ipc_server_stub.h b/services/service/include/ipc/standard/ipc_server_stub.h index 4756323015470d3d3237c4062accb45a41c08fe8..769a9f03137e8f51160511620e3d26261bb3b758 100644 --- a/services/service/include/ipc/standard/ipc_server_stub.h +++ b/services/service/include/ipc/standard/ipc_server_stub.h @@ -32,7 +32,7 @@ #include "dm_device_info.h" #include "dm_single_instance.h" - +#include "idevice_manager_ipc.h" namespace OHOS { namespace DistributedHardware { enum class ServiceRunningState { STATE_NOT_START, STATE_RUNNING }; @@ -87,7 +87,7 @@ public: * @tc.desc: Register DeviceManager Listener of the IpcServerStub * @tc.type: FUNC */ - int32_t RegisterDeviceManagerListener(const ProcessInfo &processInfo, sptr listener); + int32_t RegisterDeviceManagerListener(const ProcessInfo &processInfo, sptr listener); /** * @tc.name: IpcServerStub::UnRegisterDeviceManagerListener @@ -115,8 +115,7 @@ public: * @tc.desc: Get DmListener of the IpcServerStub * @tc.type: FUNC */ - const sptr GetDmListener(ProcessInfo processInfo) const; - + const sptr GetDmListener(ProcessInfo processInfo) const; /** * @tc.name: IpcServerStub::GetDmListenerPkgName * @tc.desc: Get DmListener PkgName of the IpcServerStub @@ -164,7 +163,7 @@ private: ServiceRunningState state_; mutable std::mutex listenerLock_; std::map> appRecipient_; - std::map> dmListener_; + std::map> dmListener_; std::set systemSA_; int64_t startBeginTime_ = 0; }; diff --git a/services/service/src/device_manager_service_listener.cpp b/services/service/src/device_manager_service_listener.cpp index 7bf14c146627fbc118e152d31e4f6f073774712f..d8a4917f46e7aa5c870ad425b1c2da4b910cc4d3 100644 --- a/services/service/src/device_manager_service_listener.cpp +++ b/services/service/src/device_manager_service_listener.cpp @@ -60,6 +60,10 @@ std::set DeviceManagerServiceListener::actUnrelatedPkgName_ = {}; std::unordered_set DeviceManagerServiceListener::highPriorityPkgNameSet_ = { "ohos.deviceprofile", "ohos.distributeddata.service" }; +DeviceManagerServiceListener::DeviceManagerServiceListener() +{ + LOGI("DeviceManagerServiceListener constructor called."); +} void handleExtraData(const DmDeviceInfo &info, DmDeviceBasicInfo &deviceBasicInfo) { cJSON *extraDataJsonObj = cJSON_Parse(info.extraData.c_str()); @@ -278,7 +282,8 @@ void DeviceManagerServiceListener::OnDeviceFound(const ProcessInfo &processInfo, pReq->SetSubscribeId(subscribeId); pReq->SetDeviceInfo(deviceInfo); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_DEVICE_FOUND, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DEVICE_FOUND, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnDiscoveryFailed(const ProcessInfo &processInfo, uint16_t subscribeId, @@ -292,7 +297,8 @@ void DeviceManagerServiceListener::OnDiscoveryFailed(const ProcessInfo &processI pReq->SetSubscribeId(subscribeId); pReq->SetResult(failedReason); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_DISCOVER_FINISH, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DISCOVER_FINISH, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnDiscoverySuccess(const ProcessInfo &processInfo, int32_t subscribeId) @@ -305,19 +311,28 @@ void DeviceManagerServiceListener::OnDiscoverySuccess(const ProcessInfo &process pReq->SetSubscribeId((uint16_t)subscribeId); pReq->SetResult(DM_OK); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_DISCOVER_FINISH, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DISCOVER_FINISH, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnPublishResult(const std::string &pkgName, int32_t publishId, int32_t publishResult) { - LOGI("OnPublishResult : %{public}d", publishResult); + LOGI("DM IDL DMSL::OnPublishResult : pkgName: %{public}s, publishId: %{public}d, publishResult: %{public}d", + pkgName.c_str(), publishResult, publishResult); std::shared_ptr pReq = std::make_shared(); std::shared_ptr pRsp = std::make_shared(); - pReq->SetPkgName(pkgName); - pReq->SetPublishId(publishId); - pReq->SetResult(publishResult); - ipcServerListener_.SendRequest(SERVER_PUBLISH_FINISH, pReq, pRsp); + ProcessInfo processInfo; + processInfo.pkgName = pkgName; + sptr deviceManagerIpc = IpcServerStub::GetInstance().GetDmListener(processInfo); + if (deviceManagerIpc == nullptr) { + LOGE("cannot get listener for package:%{public}s.", processInfo.pkgName.c_str()); + return; + } + LOGI("deviceManagerIpc address: 0x%lx for pkgName: %{public}s", + static_cast(reinterpret_cast(deviceManagerIpc.GetRefPtr())), + processInfo.pkgName.c_str()); + deviceManagerIpc->ServerPublishFinish(pkgName, publishId, publishResult); } void DeviceManagerServiceListener::OnAuthResult(const ProcessInfo &processInfo, const std::string &deviceId, @@ -340,7 +355,8 @@ void DeviceManagerServiceListener::OnAuthResult(const ProcessInfo &processInfo, pReq->SetStatus(status); pReq->SetReason(reason); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_AUTH_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_AUTH_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnUiCall(const ProcessInfo &processInfo, std::string ¶mJson) @@ -352,7 +368,8 @@ void DeviceManagerServiceListener::OnUiCall(const ProcessInfo &processInfo, std: pReq->SetPkgName(processInfo.pkgName); pReq->SetJsonParam(paramJson); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_DEVICE_FA_NOTIFY, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DEVICE_FA_NOTIFY, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnCredentialResult(const ProcessInfo &processInfo, int32_t action, @@ -366,7 +383,8 @@ void DeviceManagerServiceListener::OnCredentialResult(const ProcessInfo &process pReq->SetCredentialAction(action); pReq->SetCredentialResult(resultInfo); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_CREDENTIAL_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_CREDENTIAL_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnBindResult(const ProcessInfo &processInfo, const PeerTargetId &targetId, @@ -392,7 +410,8 @@ void DeviceManagerServiceListener::OnBindResult(const ProcessInfo &processInfo, pReq->SetStatus(status); pReq->SetContent(content); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(BIND_TARGET_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(BIND_TARGET_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnUnbindResult(const ProcessInfo &processInfo, const PeerTargetId &targetId, @@ -414,7 +433,8 @@ void DeviceManagerServiceListener::OnUnbindResult(const ProcessInfo &processInfo pReq->SetResult(result); pReq->SetContent(content); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(UNBIND_TARGET_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(UNBIND_TARGET_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnPinHolderCreate(const ProcessInfo &processInfo, const std::string &deviceId, @@ -429,7 +449,8 @@ void DeviceManagerServiceListener::OnPinHolderCreate(const ProcessInfo &processI pReq->SetPinType(pinType); pReq->SetPayload(payload); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_CREATE_PIN_HOLDER, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_CREATE_PIN_HOLDER, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnPinHolderDestroy(const ProcessInfo &processInfo, DmPinType pinType, @@ -443,7 +464,8 @@ void DeviceManagerServiceListener::OnPinHolderDestroy(const ProcessInfo &process pReq->SetPinType(pinType); pReq->SetPayload(payload); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_DESTROY_PIN_HOLDER, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DESTROY_PIN_HOLDER, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnCreateResult(const ProcessInfo &processInfo, int32_t result) @@ -455,7 +477,8 @@ void DeviceManagerServiceListener::OnCreateResult(const ProcessInfo &processInfo pReq->SetPkgName(processInfo.pkgName); pReq->SetResult(result); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_CREATE_PIN_HOLDER_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_CREATE_PIN_HOLDER_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnDestroyResult(const ProcessInfo &processInfo, int32_t result) @@ -467,7 +490,8 @@ void DeviceManagerServiceListener::OnDestroyResult(const ProcessInfo &processInf pReq->SetPkgName(processInfo.pkgName); pReq->SetResult(result); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_DESTROY_PIN_HOLDER_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DESTROY_PIN_HOLDER_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnPinHolderEvent(const ProcessInfo &processInfo, DmPinHolderEvent event, @@ -483,7 +507,8 @@ void DeviceManagerServiceListener::OnPinHolderEvent(const ProcessInfo &processIn pReq->SetResult(result); pReq->SetContent(content); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(SERVER_ON_PIN_HOLDER_EVENT, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_ON_PIN_HOLDER_EVENT, pReq, pRsp); + return; } #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) int32_t DeviceManagerServiceListener::ConvertUdidHashToAnoyAndSave(const std::string &pkgName, DmDeviceInfo &deviceInfo) @@ -546,7 +571,8 @@ void DeviceManagerServiceListener::OnDeviceTrustChange(const std::string &udid, pReq->SetUuid(uuid); pReq->SetAuthForm(authForm); pReq->SetProcessInfo(item); - ipcServerListener_.SendRequest(REMOTE_DEVICE_TRUST_CHANGE, pReq, pRsp); + //ipcServerListener_.SendRequest(REMOTE_DEVICE_TRUST_CHANGE, pReq, pRsp); + return; } } @@ -584,7 +610,8 @@ void DeviceManagerServiceListener::OnDeviceScreenStateChange(const ProcessInfo & GetNotifyProcessInfoByUserId(userId, DmCommonNotifyEvent::REG_DEVICE_SCREEN_STATE); for (const auto &item : processInfoVec) { SetDeviceScreenInfo(pReq, item, devInfo); - ipcServerListener_.SendRequest(SERVER_DEVICE_SCREEN_STATE_NOTIFY, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DEVICE_SCREEN_STATE_NOTIFY, pReq, pRsp); + return; } } else { std::shared_ptr pReq = std::make_shared(); @@ -594,7 +621,8 @@ void DeviceManagerServiceListener::OnDeviceScreenStateChange(const ProcessInfo & processInfoVec.push_back(processInfo); for (const auto &item : processInfoVec) { SetDeviceScreenInfo(pReq, item, devInfo); - ipcServerListener_.SendRequest(SERVER_DEVICE_SCREEN_STATE_NOTIFY, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DEVICE_SCREEN_STATE_NOTIFY, pReq, pRsp); + return; } } } @@ -632,7 +660,8 @@ void DeviceManagerServiceListener::OnCredentialAuthStatus(const ProcessInfo &pro pReq->SetErrCode(errcode); pReq->SetPkgName(item.pkgName); pReq->SetProcessInfo(item); - ipcServerListener_.SendRequest(SERVICE_CREDENTIAL_AUTH_STATUS_NOTIFY, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVICE_CREDENTIAL_AUTH_STATUS_NOTIFY, pReq, pRsp); + return; } } @@ -683,7 +712,8 @@ void DeviceManagerServiceListener::OnSinkBindResult(const ProcessInfo &processIn pReq->SetResult(result); pReq->SetStatus(status); pReq->SetContent(content); - ipcServerListener_.SendRequest(SINK_BIND_TARGET_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(SINK_BIND_TARGET_RESULT, pReq, pRsp); + return; } std::vector DeviceManagerServiceListener::GetWhiteListSAProcessInfo( @@ -777,7 +807,8 @@ void DeviceManagerServiceListener::ProcessDeviceOnline(const std::vector autoLock(alreadyNotifyPkgNameLock_); @@ -825,7 +857,8 @@ void DeviceManagerServiceListener::ProcessDeviceInfoChange(const std::vector pRsp = std::make_shared(); for (const auto &it : procInfoVec) { SetDeviceInfo(pReq, it, state, info, deviceBasicInfo); - ipcServerListener_.SendRequest(SERVER_DEVICE_STATE_NOTIFY, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DEVICE_STATE_NOTIFY, pReq, pRsp); + return; } } @@ -850,7 +883,8 @@ void DeviceManagerServiceListener::ProcessAppOnline(const std::vector pRsp = std::make_shared(); ConvertDeviceInfoToDeviceBasicInfo(processInfo.pkgName, item, deviceBasicInfo); SetDeviceInfo(pReq, processInfo, DmDeviceState::DEVICE_STATE_ONLINE, item, deviceBasicInfo); - ipcServerListener_.SendRequest(SERVER_DEVICE_STATE_NOTIFY, pReq, pRsp); + //ipcServerListener_.SendRequest(SERVER_DEVICE_STATE_NOTIFY, pReq, pRsp); + return; } } @@ -973,7 +1010,8 @@ void DeviceManagerServiceListener::OnGetDeviceProfileInfoListResult(const Proces #endif pReq->SetResult(code); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(GET_DEVICE_PROFILE_INFO_LIST_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(GET_DEVICE_PROFILE_INFO_LIST_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnGetDeviceIconInfoResult(const ProcessInfo &processInfo, @@ -986,7 +1024,8 @@ void DeviceManagerServiceListener::OnGetDeviceIconInfoResult(const ProcessInfo & pReq->SetDmDeviceIconInfo(dmDeviceIconInfo); pReq->SetResult(code); pReq->SetProcessInfo(processInfo); - ipcServerListener_.SendRequest(GET_DEVICE_ICON_INFO_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(GET_DEVICE_ICON_INFO_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnSetLocalDeviceNameResult(const ProcessInfo &processInfo, @@ -1005,7 +1044,8 @@ void DeviceManagerServiceListener::OnSetLocalDeviceNameResult(const ProcessInfo #else (void) deviceName; #endif - ipcServerListener_.SendRequest(SET_LOCAL_DEVICE_NAME_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(SET_LOCAL_DEVICE_NAME_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::OnSetRemoteDeviceNameResult(const ProcessInfo &processInfo, @@ -1019,7 +1059,8 @@ void DeviceManagerServiceListener::OnSetRemoteDeviceNameResult(const ProcessInfo pReq->SetResult(code); pReq->SetProcessInfo(processInfo); (void) deviceName; - ipcServerListener_.SendRequest(SET_REMOTE_DEVICE_NAME_RESULT, pReq, pRsp); + //ipcServerListener_.SendRequest(SET_REMOTE_DEVICE_NAME_RESULT, pReq, pRsp); + return; } void DeviceManagerServiceListener::SetExistPkgName(const std::set &pkgNameSet) diff --git a/services/service/src/ipc/standard/ipc_cmd_parser.cpp b/services/service/src/ipc/standard/ipc_cmd_parser.cpp index 9a70e70779b6cec36ce7779fdd7b5a8e3a145876..07bf713823c3f4af57af8187d15ec13478f8ce12 100644 --- a/services/service/src/ipc/standard/ipc_cmd_parser.cpp +++ b/services/service/src/ipc/standard/ipc_cmd_parser.cpp @@ -49,6 +49,8 @@ #if !(defined(__LITEOS_M__) || defined(LITE_DEVICE)) #include "multiple_user_connector.h" #endif +#include "device_manager_ipc_proxy.h" +#include "idevice_manager_ipc.h" namespace OHOS { namespace DistributedHardware { const unsigned int XCOLLIE_TIMEOUT_S = 5; @@ -464,7 +466,10 @@ ON_IPC_CMD(REGISTER_DEVICE_MANAGER_LISTENER, MessageParcel &data, MessageParcel CancelXcollieTimer(timerId); return ERR_DM_POINT_NULL; } - sptr callback(new IpcServerClientProxy(listener)); + LOGI("Listener successfully read from MessageParcel. pkgName: %{public}s, listener address: 0x%lx", + pkgName.c_str(), static_cast(reinterpret_cast(listener.GetRefPtr()))); + sptr callback(new DeviceManagerIpcProxy(listener)); + callback->ServerPublishFinish("abc", 2, 3); if (callback == nullptr) { LOGE("create ipc server client proxy failed."); CancelXcollieTimer(timerId); diff --git a/services/service/src/ipc/standard/ipc_server_listener.cpp b/services/service/src/ipc/standard/ipc_server_listener.cpp index b40ee0a405d49b3ee8a084a2eb4ea28a5e810c6e..b71ccaea0c646278baa150e8d590a8949cd7428e 100644 --- a/services/service/src/ipc/standard/ipc_server_listener.cpp +++ b/services/service/src/ipc/standard/ipc_server_listener.cpp @@ -36,12 +36,13 @@ int32_t IpcServerListener::SendRequest(int32_t cmdCode, std::shared_ptr LOGE("Invalid parameter, pkgName is empty."); return ERR_DM_INPUT_PARA_INVALID; } - sptr listener = IpcServerStub::GetInstance().GetDmListener(processInfo); - if (listener == nullptr) { - LOGE("cannot get listener for package:%{public}s.", processInfo.pkgName.c_str()); - return ERR_DM_POINT_NULL; - } - return listener->SendCmd(cmdCode, req, rsp); + // sptr listener = IpcServerStub::GetInstance().GetDmListener(processInfo); + // if (listener == nullptr) { + // LOGE("cannot get listener for package:%{public}s.", processInfo.pkgName.c_str()); + // return ERR_DM_POINT_NULL; + // } + // return listener->SendCmd(cmdCode, req, rsp); + return 0; } std::vector IpcServerListener::GetAllProcessInfo() diff --git a/services/service/src/ipc/standard/ipc_server_stub.cpp b/services/service/src/ipc/standard/ipc_server_stub.cpp index c85383af7292f05e11704bbdbc510063dd097d6b..663f90dd922b3652a80502810c216a28834bcbb8 100644 --- a/services/service/src/ipc/standard/ipc_server_stub.cpp +++ b/services/service/src/ipc/standard/ipc_server_stub.cpp @@ -282,7 +282,7 @@ ServiceRunningState IpcServerStub::QueryServiceState() const return state_; } -int32_t IpcServerStub::RegisterDeviceManagerListener(const ProcessInfo &processInfo, sptr listener) +int32_t IpcServerStub::RegisterDeviceManagerListener(const ProcessInfo &processInfo, sptr listener) { if (processInfo.pkgName.empty() || listener == nullptr) { LOGE("RegisterDeviceManagerListener error: input parameter invalid."); @@ -321,6 +321,14 @@ int32_t IpcServerStub::RegisterDeviceManagerListener(const ProcessInfo &processI dmListener_[processInfo] = listener; appRecipient_[processInfo] = appRecipient; AddSystemSA(processInfo.pkgName); + // 打印 dmListener_ 的内容和地址 + LOGI("dmListener_ current size: %{public}zu", dmListener_.size()); + for (const auto &entry : dmListener_) { + const ProcessInfo &info = entry.first; + const sptr &broker = entry.second; + LOGI("dmListener_ element - pkgName: %{public}s, userId: %{public}d, listener address: 0x%lx", + info.pkgName.c_str(), info.userId, static_cast(reinterpret_cast(broker.GetRefPtr()))); + } LOGI("complete."); return DM_OK; } @@ -338,6 +346,12 @@ int32_t IpcServerStub::UnRegisterDeviceManagerListener(const ProcessInfo &proces LOGI("Listener not exists"); return DM_OK; } + // 打印当前 dmListener_ 的内容和地址 + LOGI("dmListener_ current size: %{public}zu", dmListener_.size()); + for (const auto &entry : dmListener_) { + LOGI("dmListener_ element - pkgName: %{public}s, userId: %{public}d, listener address: 0x%lx", + entry.first.pkgName.c_str(), entry.first.userId, static_cast(reinterpret_cast(entry.second.GetRefPtr()))); + } auto recipientIter = appRecipient_.find(processInfo); if (recipientIter == appRecipient_.end()) { LOGI("AppRecipient not exists"); @@ -364,13 +378,21 @@ std::vector IpcServerStub::GetAllProcessInfo() { std::vector processInfoVec; std::lock_guard autoLock(listenerLock_); + LOGI("dmListener_ current size: %{public}zu", dmListener_.size()); for (const auto &iter : dmListener_) { - processInfoVec.push_back(iter.first); + const ProcessInfo &info = iter.first; + const sptr &listener = iter.second; + + // 打印元素内容和地址 + LOGI("dmListener_ element - pkgName: %{public}s, userId: %{public}d, listener address: 0x%lx", + info.pkgName.c_str(), info.userId, static_cast(reinterpret_cast(listener.GetRefPtr()))); + + processInfoVec.push_back(info); } return processInfoVec; } -const sptr IpcServerStub::GetDmListener(ProcessInfo processInfo) const +const sptr IpcServerStub::GetDmListener(ProcessInfo processInfo) const { if (processInfo.pkgName.empty()) { LOGE("Invalid parameter, pkgName is empty."); @@ -379,8 +401,13 @@ const sptr IpcServerStub::GetDmListener(ProcessInfo processInfo std::lock_guard autoLock(listenerLock_); auto iter = dmListener_.find(processInfo); if (iter == dmListener_.end()) { + LOGI("dmListener_ does not contain pkgName: %{public}s", processInfo.pkgName.c_str()); return nullptr; } + + // 打印元素内容和地址 + LOGI("dmListener_ element - pkgName: %{public}s, userId: %{public}d, listener address: 0x%lx", + iter->first.pkgName.c_str(), iter->first.userId, static_cast(reinterpret_cast(iter->second.GetRefPtr()))); return iter->second; } diff --git a/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn index 11daa7b6b34c829ef7fc318abc6e538c381be7b7..88427904689886f482919238922c647730cd2106 100644 --- a/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedevice_fuzzer/BUILD.gn @@ -64,6 +64,7 @@ ohos_fuzztest("AuthenticateDeviceFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:device_manager_ipc", ] defines = [ diff --git a/test/commonfuzztest/dmcredentialimpl_fuzzer/BUILD.gn b/test/commonfuzztest/dmcredentialimpl_fuzzer/BUILD.gn index 05d532c4cb98d96033d7ebaaa145d8b21ecb399a..bdb63ba1c2fb255d56426117eb85de94b98b6e5b 100644 --- a/test/commonfuzztest/dmcredentialimpl_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmcredentialimpl_fuzzer/BUILD.gn @@ -52,7 +52,10 @@ ohos_fuzztest("DMCredentialImplFuzzTest") { sources = [ "dm_credential_impl_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn index b6d56f31ee781fe79c44bd71183a715df969b8cc..b43020eebe443e1b851114c92c678168b77f1e22 100644 --- a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn +++ b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("GenerateEncryptedUuidFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn index c8cbead482d1639466f483420938ff4c07f44c54..8c7a8b626984949ca3b73b6cf4f279c0d839b125 100644 --- a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn +++ b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("GetDeviceInfoFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] defines = [ diff --git a/test/interfacesfuzztest/devicemanagerimpl_fuzzer/BUILD.gn b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/BUILD.gn index a7e9c70382236ee1d7ae696f97438bb8ea36608b..c894e1768a4e8102c0bd6058e4e7c65d062d47c1 100755 --- a/test/interfacesfuzztest/devicemanagerimpl_fuzzer/BUILD.gn +++ b/test/interfacesfuzztest/devicemanagerimpl_fuzzer/BUILD.gn @@ -63,6 +63,8 @@ ohos_fuzztest("DeviceManagerImplFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", + "${utils_path}:devicemanagerutils", + "${devicemanager_path}/services/service:device_manager_ipc", "${utils_path}:devicemanagerutilstest", ] diff --git a/test/servicesfuzztest/devicediscovery_fuzzer/BUILD.gn b/test/servicesfuzztest/devicediscovery_fuzzer/BUILD.gn index d25753b45ffe1f0b7d77d77c8f81367c531a27f3..8e67e511d198fde78faac43daeec036f3120ceec 100644 --- a/test/servicesfuzztest/devicediscovery_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicediscovery_fuzzer/BUILD.gn @@ -59,7 +59,10 @@ ohos_fuzztest("DeviceDiscoveryFuzzTest") { ] sources = [ "device_discovery_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/devicelist_fuzzer/BUILD.gn b/test/servicesfuzztest/devicelist_fuzzer/BUILD.gn index dabde34eb15d93fbedbc1b110d106a3849d186d3..40b8fb213ec1639bf03634b51922119df9b6dc8d 100644 --- a/test/servicesfuzztest/devicelist_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicelist_fuzzer/BUILD.gn @@ -60,7 +60,10 @@ ohos_fuzztest("DeviceListFuzzTest") { ] sources = [ "device_list_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/devicelistrefresh_fuzzer/BUILD.gn b/test/servicesfuzztest/devicelistrefresh_fuzzer/BUILD.gn index e8f6491639ec04868ed0349a427112839b08ca74..1d0e1ebac474436eb63bf727b1c430f7e7bf691d 100644 --- a/test/servicesfuzztest/devicelistrefresh_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicelistrefresh_fuzzer/BUILD.gn @@ -59,7 +59,10 @@ ohos_fuzztest("DeviceListRefreshFuzzTest") { ] sources = [ "device_list_refresh_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/devicemanagernotify_fuzzer/BUILD.gn b/test/servicesfuzztest/devicemanagernotify_fuzzer/BUILD.gn index d0a50b7ff2c2df6cab1c950c27776a8881a11a98..abc3b9643b8810777685a0cc9fbc906dd709af4d 100644 --- a/test/servicesfuzztest/devicemanagernotify_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicemanagernotify_fuzzer/BUILD.gn @@ -62,6 +62,7 @@ ohos_fuzztest("DeviceManagerNotifyFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn b/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn index 52a8b23f3a4d3d82a062eafabda45b0d44e6444c..bd96a1a3779aab2360de9b01f513895d8914f821 100644 --- a/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicepublish_fuzzer/BUILD.gn @@ -63,6 +63,7 @@ ohos_fuzztest("DevicePublishFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutilstest", + "${devicemanager_path}/services/service:device_manager_ipc", ] defines = [ diff --git a/test/servicesfuzztest/dmsoftbuslistener_fuzzer/BUILD.gn b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/BUILD.gn index 414caff5abfa17dc56bf5c8fb441f024548bd039..81a00163e09a61e10b2b221268c4c91e023b9dd8 100644 --- a/test/servicesfuzztest/dmsoftbuslistener_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/dmsoftbuslistener_fuzzer/BUILD.gn @@ -62,6 +62,7 @@ ohos_fuzztest("DmSoftbusListenerFuzzTest") { "${devicemanager_path}/services/service:devicemanagerservicetest", "${json_path}:devicemanagerjson", "${utils_path}:devicemanagerutilstest", + "${devicemanager_path}/services/service:device_manager_ipc", ] defines = [ diff --git a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn index f90940c283f0fa28cd3ec4c6fb31212d66eab56c..ac345170492049ed4812e93cad5054130922c542 100644 --- a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("GetLocalDeviceInfoFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] defines = [ diff --git a/test/servicesfuzztest/getudidbynetworkid_fuzzer/BUILD.gn b/test/servicesfuzztest/getudidbynetworkid_fuzzer/BUILD.gn index 380474c9d2921318fc78c9c26df46436f8220988..79bcba4a009df4a3c86fc6f73a56265ac13f8cbd 100644 --- a/test/servicesfuzztest/getudidbynetworkid_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getudidbynetworkid_fuzzer/BUILD.gn @@ -58,7 +58,10 @@ ohos_fuzztest("GetUdidByNetworkIdFuzzTest") { ] sources = [ "get_udid_by_network_id_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/getuuidbynetworkid_fuzzer/BUILD.gn b/test/servicesfuzztest/getuuidbynetworkid_fuzzer/BUILD.gn index 6f32db722bf5d5f7dbc86ce505079dd3174bd188..c2552c38abf132c2f784030144f2f0141ea21ed7 100644 --- a/test/servicesfuzztest/getuuidbynetworkid_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getuuidbynetworkid_fuzzer/BUILD.gn @@ -58,7 +58,10 @@ ohos_fuzztest("GetUuidByNetworkIdFuzzTest") { ] sources = [ "get_uuid_by_network_id_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/initdevicemanager_fuzzer/BUILD.gn b/test/servicesfuzztest/initdevicemanager_fuzzer/BUILD.gn index 800fcc952a3507416d31cc643c4dec292bc83007..7461d68d5216214141b96dc5f51b78ffd4023101 100644 --- a/test/servicesfuzztest/initdevicemanager_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/initdevicemanager_fuzzer/BUILD.gn @@ -52,7 +52,10 @@ ohos_fuzztest("InitDeviceManagerFuzzTest") { sources = [ "init_device_manager_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/ipcclientmanager_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcclientmanager_fuzzer/BUILD.gn index 04ab3d1024423451c829534a719a31bd4e7018c7..e3867318302cbed900ad27188cbde7ce5f365a86 100644 --- a/test/servicesfuzztest/ipcclientmanager_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcclientmanager_fuzzer/BUILD.gn @@ -61,7 +61,9 @@ ohos_fuzztest("IpcClientManagerFuzzTest") { sources = [ "ipc_client_manager_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc",] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn b/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn index 30ec4560599aebe452fa7e8b30b50c83e7e39da6..60dde713a969d0ef5c67ecb4fd01ddec0ccb755e 100644 --- a/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipccmdregister_fuzzer/BUILD.gn @@ -67,7 +67,9 @@ ohos_fuzztest("IpcCmdRegisterFuzzTest") { "LOG_DOMAIN=0xD004110", ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc",] external_deps = [ "c_utils:utils", diff --git a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn index a021875d7d5d56c2d21c49abe99fc350f4e6e78e..cb2c008b812a95d131620c41def914752727471e 100644 --- a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -60,7 +60,10 @@ ohos_fuzztest("IpcServerStubFuzzTest") { sources = [ "ipc_server_stub_fuzzer.cpp" ] - deps = [ "${devicemanager_path}/services/service:devicemanagerservicetest" ] + deps = [ + "${devicemanager_path}/services/service:devicemanagerservicetest", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/ipcserverstub_fuzzer/ipc_server_stub_fuzzer.cpp b/test/servicesfuzztest/ipcserverstub_fuzzer/ipc_server_stub_fuzzer.cpp index 1a75d5056d5d3646ec456a6daa445b3059a94823..ec6c23aaf3d48924a4626b44cf2cae2d8d8ad017 100644 --- a/test/servicesfuzztest/ipcserverstub_fuzzer/ipc_server_stub_fuzzer.cpp +++ b/test/servicesfuzztest/ipcserverstub_fuzzer/ipc_server_stub_fuzzer.cpp @@ -53,7 +53,7 @@ void IpcServerStubFuzzTest(const uint8_t* data, size_t size) IpcServerStub::GetInstance().Init(); IpcServerStub::GetInstance().OnRemoteRequest(code, data1, reply, option); - IpcServerStub::GetInstance().RegisterDeviceManagerListener(processInfo, listener); + //IpcServerStub::GetInstance().RegisterDeviceManagerListener(processInfo, listener); IpcServerStub::GetInstance().GetDmListener(processInfo); IpcServerStub::GetInstance().SendCmd(code, req, rsp); IpcServerStub::GetInstance().GetAllProcessInfo(); diff --git a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn index dfd1270d57c54b9dc0118f620ea02bd4d017590d..060ed0f8e64b62c82c1967d61accd31a454a3a20 100644 --- a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("NotifyEventFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/servicesfuzztest/registerdevicemanagerfacallback_fuzzer/BUILD.gn b/test/servicesfuzztest/registerdevicemanagerfacallback_fuzzer/BUILD.gn index 9db7b0d3d2848910b7d76832c2a722cf3c3cd319..b9c91292e024b91f247879d5a9703b3cdbc53a6e 100644 --- a/test/servicesfuzztest/registerdevicemanagerfacallback_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/registerdevicemanagerfacallback_fuzzer/BUILD.gn @@ -58,7 +58,10 @@ ohos_fuzztest("RegisterDeviceManagerFaCallbackFuzzTest") { sources = [ "register_device_manager_fa_callback_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/registerdevstatecallback_fuzzer/BUILD.gn b/test/servicesfuzztest/registerdevstatecallback_fuzzer/BUILD.gn index bef378127c31e339f37da25c4751447925a55858..6f1da7092ff16a0c66fa05e40142c3dc9f5a9f2d 100644 --- a/test/servicesfuzztest/registerdevstatecallback_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/registerdevstatecallback_fuzzer/BUILD.gn @@ -58,7 +58,10 @@ ohos_fuzztest("RegisterDevStateCallbackFuzzTest") { sources = [ "register_dev_state_callback_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/setuseroperation_fuzzer/BUILD.gn b/test/servicesfuzztest/setuseroperation_fuzzer/BUILD.gn index 6c09931f42e43a2b42a0568c498fe3ecce03f178..4370a219fa0194eac8338e507bc3e4b6770c2f48 100644 --- a/test/servicesfuzztest/setuseroperation_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/setuseroperation_fuzzer/BUILD.gn @@ -58,7 +58,10 @@ ohos_fuzztest("SetUserOperationFuzzTest") { sources = [ "set_user_operation_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/unauthenticatedevice_fuzzer/BUILD.gn b/test/servicesfuzztest/unauthenticatedevice_fuzzer/BUILD.gn index e84dc5c3da069cc7d763368acb287790d5e83628..af451cb762acddd6161ff078e392df31e9771594 100644 --- a/test/servicesfuzztest/unauthenticatedevice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/unauthenticatedevice_fuzzer/BUILD.gn @@ -58,7 +58,10 @@ ohos_fuzztest("UnAuthenticateDeviceFuzzTest") { sources = [ "un_authenticate_device_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/unregisterdevicemanagerfacallback_fuzzer/BUILD.gn b/test/servicesfuzztest/unregisterdevicemanagerfacallback_fuzzer/BUILD.gn index a2b11c1168336b5d16a5352c86b2093ab89189d6..c7a89bbee75bb7343fdf2b46199b48ed5796d54d 100644 --- a/test/servicesfuzztest/unregisterdevicemanagerfacallback_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/unregisterdevicemanagerfacallback_fuzzer/BUILD.gn @@ -58,7 +58,10 @@ ohos_fuzztest("UnRegisterDeviceManagerFaCallbackFuzzTest") { sources = [ "un_register_device_manager_fa_call_back_fuzzer.cpp" ] - deps = [ "${innerkits_path}/native_cpp:devicemanagersdk" ] + deps = [ + "${innerkits_path}/native_cpp:devicemanagersdk", + "${devicemanager_path}/services/service:device_manager_ipc", + ] defines = [ "HI_LOG_ENABLE", diff --git a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn index be65e803c71cc017401a696d1edd29caab62a0f4..2fc7de63a1316f4d87428032c07a18bf5fd677f7 100644 --- a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("CloseDmRadarHelperObjFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn index 7ba953e6c881dda203cea0e306c56a8ac23b056a..6884f37e6bf2fffb60f1985490b77235c071244a 100644 --- a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("OnParameterChgCallbackFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn index 420fe22764d20857ee06c49a31cbd8c2d43d3110..53f53a3563691a6f6919fbcc572aaa7e87a00acf 100644 --- a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("OnSoftbusDeviceInfoChangedFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn index aa9cd8d97b35452d029e68379cdd3113aa461314..4f15430fe32812ad12ec4d8a054544cad630a587 100644 --- a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("OnSoftbusDeviceOfflineFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn index 83ffef54469c1a1a9b70e28c44fd8ba9260ef27b..4f854e27908c2831ad2d14e765589253367f9c95 100644 --- a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("OnSoftbusDeviceOnlineFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn index fc2e6cd206a218d9f7622be4d4434bfc028cfe84..f15f48a73ccdc00e0638cb70a9261edfbe1774f9 100644 --- a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("OnSoftbusListenerDeviceFoundFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn index c3066fa506e90d0e45bb12206983b5898580e37f..dd754f973a06ca5b51a1144ad16f1e398aab947e 100644 --- a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("PublishSoftbusLnnFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn index 2a4a650e9ec5459b9bafe91e6721f71723a78486..4af506c72abbc36b5ae47a0664c9db00926166c9 100644 --- a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("RefreshSoftbusLnnFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn index 56c9f5fac539b66bc84fc4972390d371c0ab3321..4a06102d70262d5722323e444acd8075f494cb0e 100644 --- a/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistener_fuzzer/BUILD.gn @@ -49,6 +49,7 @@ ohos_fuzztest("SoftbusListenerFuzzTest") { "${json_path}:devicemanagerjson", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn index 46986b2f80415ee98a9c38a12e0e094b50a6cae6..3a06b3303be65044ba0e396a1bde74b84af17842 100644 --- a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn @@ -45,6 +45,7 @@ ohos_fuzztest("SoftbusListenerGetLocalDeviceInfoFuzzTest") { "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutilstest", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn index c844e2e0c4c9d455e33d0da29903cde9b6110cb9..046c88bb9f3666979604815fd279732a8884e9c1 100644 --- a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn @@ -44,6 +44,7 @@ ohos_fuzztest("StopRefreshSoftbusLnnFuzzTest") { "${innerkits_path}/native_cpp:devicemanagersdk", "${services_path}:devicemanagerservicetest", "${servicesimpl_path}:devicemanagerserviceimpl", + "${devicemanager_path}/services/service:device_manager_ipc", ] external_deps = [ diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 03fde27c619e7f57c492d4ff5f60a0fb6d29d879..58fe0a25e7e72f45d69d564db00e0a38c6f01e57 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -75,7 +75,6 @@ group("unittest") { ":UTTest_hichain_auth_connector", ":UTTest_hichain_connector", ":UTTest_hichain_listener", - ":UTTest_ipc_client_manager", ":UTTest_ipc_client_proxy", ":UTTest_ipc_client_server_proxy", ":UTTest_ipc_client_stub", @@ -83,9 +82,6 @@ group("unittest") { ":UTTest_ipc_cmd_parser_service", ":UTTest_ipc_cmd_register", ":UTTest_ipc_get_device_info_rsp", - ":UTTest_ipc_server_client_proxy", - ":UTTest_ipc_server_listener", - ":UTTest_ipc_server_stub", ":UTTest_json_object", ":UTTest_json_str_handle", ":UTTest_kv_adapter_manager", @@ -173,7 +169,9 @@ ohos_unittest("UTTest_ipc_cmd_parser_client") { "UTTest_ipc_cmd_parser_client.cpp", ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc",] external_deps = [ "device_auth:deviceauth_sdk", @@ -206,7 +204,9 @@ ohos_unittest("UTTest_ipc_cmd_parser_service") { "UTTest_ipc_cmd_parser_service.cpp", ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc",] external_deps = [ "cJSON:cjson", @@ -509,7 +509,9 @@ ohos_unittest("UTTest_device_manager_service_three") { "mock/softbus_listener_mock.cpp", ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc",] external_deps = [ "access_token:libaccesstoken_sdk", @@ -710,7 +712,9 @@ ohos_unittest("UTTest_softbus_listener") { "mock/softbus_center_mock.cpp", ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc",] external_deps = [ "cJSON:cjson", @@ -995,7 +999,10 @@ ohos_unittest("UTTest_ipc_server_client_proxy") { "UTTest_ipc_server_client_proxy.cpp", ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc", + ] external_deps = [ "cJSON:cjson", @@ -1072,7 +1079,10 @@ ohos_unittest("UTTest_device_manager_impl") { "mock/device_manager_notify_mock.cpp", ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc", + ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -1105,7 +1115,10 @@ ohos_unittest("UTTest_dm_import_auth_code") { sources = [ "UTTest_dm_import_auth_code.cpp" ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc", + ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -1222,7 +1235,9 @@ ohos_unittest("UTTest_device_manager_notify") { "UTTest_device_manager_notify_two.cpp", ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc",] external_deps = [ "device_auth:deviceauth_sdk", @@ -1447,7 +1462,10 @@ ohos_unittest("UTTest_auth_response_state") { sources = [ "UTTest_auth_response_state.cpp" ] - deps = [ ":device_manager_test_common" ] + deps = [ + ":device_manager_test_common", + "${devicemanager_path}/services/service:device_manager_ipc", + ] external_deps = [ "device_auth:deviceauth_sdk",