diff --git a/services/service/BUILD.gn b/services/service/BUILD.gn index 3bb498b3fc0fc73bcf204b4ac1fc79ba31872202..9a161109eedcfad47b47e4ea940c582bc1c1c38f 100644 --- a/services/service/BUILD.gn +++ b/services/service/BUILD.gn @@ -167,6 +167,148 @@ if (defined(ohos_lite)) { ubsan = true } + cflags = [ + "-fPIC", + "-fstack-protector-strong", + "-fvisibility=hidden", + ] + + ldflags = [ + "-Wl,-z,relro", + "-Wl,-z,now", + ] + + sources = [ + "${common_path}/src/dfx/standard/dm_hidumper.cpp", + "${common_path}/src/dm_anonymous.cpp", + "${common_path}/src/ipc/standard/ipc_cmd_register.cpp", + "${common_path}/src/ipc/standard/ipc_model_codec.cpp", + "src/advertise/advertise_manager.cpp", + "src/device_manager_service.cpp", + "src/device_manager_service_listener.cpp", + "src/devicenamemgr/account_boot_listener.cpp", + "src/devicenamemgr/device_name_change_monitor.cpp", + "src/devicenamemgr/device_name_manager.cpp", + "src/devicenamemgr/local_device_name_mgr.cpp", + "src/devicenamemgr/settings_data_event_monitor.cpp", + "src/discovery/discovery_filter.cpp", + "src/discovery/discovery_manager.cpp", + "src/hichain/hichain_listener.cpp", + "src/ipc/standard/ipc_cmd_parser.cpp", + "src/ipc/standard/ipc_server_client_proxy.cpp", + "src/ipc/standard/ipc_server_listener.cpp", + "src/ipc/standard/ipc_server_stub.cpp", + "src/notify/device_manager_service_notify.cpp", + "src/permission/standard/permission_manager.cpp", + "src/pinholder/pin_holder.cpp", + "src/pinholder/pin_holder_session.cpp", + "src/publishcommonevent/dm_account_common_event.cpp", + "src/publishcommonevent/dm_data_share_common_event.cpp", + "src/publishcommonevent/dm_package_common_event.cpp", + "src/publishcommonevent/dm_screen_common_event.cpp", + "src/relationshipsyncmgr/dm_comm_tool.cpp", + "src/relationshipsyncmgr/dm_transport.cpp", + "src/relationshipsyncmgr/dm_transport_msg.cpp", + "src/relationshipsyncmgr/relationship_sync_mgr.cpp", + "src/softbus/mine_softbus_listener.cpp", + "src/softbus/softbus_listener.cpp", + ] + + public_configs = [ ":devicemanagerservice_config" ] + + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"devicemanagerservice\"", + "LOG_DOMAIN=0xD004110", + ] + + deps = [ + "${devicemanager_path}/commondependency:devicemanagerdependency", + "${devicemanager_path}/radar:devicemanagerradar", + "${softbuscache_parh}:dmdevicecache", + "${utils_path}:devicemanagerutils", + ] + + external_deps = [ + "ability_base:want", + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "bundle_framework:appexecfwk_base", + "cJSON:cjson", + "c_utils:utils", + "common_event_service:cesfwk_core", + "common_event_service:cesfwk_innerkits", + "data_share:datashare_common", + "data_share:datashare_consumer", + "device_auth:deviceauth_sdk", + "device_info_manager:distributed_device_profile_common", + "device_info_manager:distributed_device_profile_sdk", + "dsoftbus:softbus_client", + "eventhandler:libeventhandler", + "ffrt:libffrt", + "hicollie:libhicollie", + "hilog:libhilog", + "init:libbeget_proxy", + "init:libbegetutil", + "ipc:ipc_core", + "ipc:ipc_single", + "openssl:libcrypto_shared", + "os_account:libaccountkits", + "os_account:os_account_innerkits", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + if (support_bluetooth || support_wifi) { + sources += [ + "src/publishcommonevent/dm_publish_common_event.cpp", + "src/softbus/softbus_publish.cpp", + ] + } + + if (support_bluetooth) { + defines += [ "SUPPORT_BLUETOOTH" ] + external_deps += [ "bluetooth:btframework" ] + } + + if (support_wifi) { + defines += [ "SUPPORT_WIFI" ] + external_deps += [ "wifi:wifi_sdk" ] + } + + if (support_power_manager) { + defines += [ "SUPPORT_POWER_MANAGER" ] + external_deps += [ "power_manager:powermgr_client" ] + } + + if (support_memmgr) { + defines += [ "SUPPORT_MEMMGR" ] + external_deps += [ "memmgr:memmgrclient" ] + } + + if (device_manager_common) { + defines += [ "DEVICE_MANAGER_COMMON_FLAG" ] + } + + public_external_deps = [ "json:nlohmann_json_static" ] + + subsystem_name = "distributedhardware" + + part_name = "device_manager" + } + + ohos_static_library("devicemanagerservicestatic") { + branch_protector_ret = "pac_ret" + + sanitize = { + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + integer_overflow = true + ubsan = true + } + cflags = [ "-fPIC", "-fstack-protector-strong", diff --git a/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn index 38fd02bf5b61e64938696a750e9dd97a238720bd..3564e0baf2d3036aa9fc57d85f4771ba6c33cdf0 100644 --- a/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedeviceservice_fuzzer/BUILD.gn @@ -56,7 +56,7 @@ ohos_fuzztest("AuthenticateDeviceServiceFuzzTest") { sources = [ "authenticate_device_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn index c626f803edb0d8afeccf99d418ddf3eb0cdf8c01..e669873378bfd49056ab23cbe13ae5d90a79988c 100644 --- a/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn +++ b/test/commonfuzztest/authenticatedeviceserviceimpl_fuzzer/BUILD.gn @@ -57,7 +57,7 @@ ohos_fuzztest("AuthenticateDeviceServiceImplFuzzTest") { deps = [ "${devicemanager_path}/services/implementation:devicemanagerserviceimpl", - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn index 3c7e382814dbe6f0b79f53256d8ade6a86a92407..dcd7ba59e2b22f91bfca1daf1fbd5808d0501ad3 100644 --- a/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmauthmanager_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("DmAuthManagerFuzzTest") { sources = [ "dm_auth_manager_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn b/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn index c2e7053b7b495ee48dceae37d93fe7b75b3ca67d..024c2fe220d422fc63295fe51520fc1690974c13 100644 --- a/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn +++ b/test/commonfuzztest/dmdiscoverymanager_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("DmDiscoveryManagerFuzzTest") { sources = [ "dm_discovery_manager_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn index 8583d68184621c320a3235d037c7b5dfca50f35a..083b68ba32b54ecbd7acfdbdc24c35d41b07cdfa 100644 --- a/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn +++ b/test/commonfuzztest/generateencrypteduuid_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("GenerateEncryptedUuidFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn index 59c82456562094031ef6e6ed33bec1d7aa6826d6..a65e052c4f8d7746e4447520c6dfa73c0a22cfe6 100644 --- a/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn +++ b/test/commonfuzztest/getdeviceinfo_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("GetDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn b/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn index 94cc1e499df69ee8f345048716a251fd86b1b6fd..b178cf06cec5b536326fab2b9051fce728800f06 100644 --- a/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn +++ b/test/commonfuzztest/hichainconnector_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("HichainConnectorFuzzTest") { sources = [ "hichain_connector_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn b/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn index ce95aff04c9addbaab9bb37527da0861806216c9..ef1fb1eac3df3e60d3fec75d31560ddd6c350ae8 100644 --- a/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn +++ b/test/commonfuzztest/ondatareceived_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("OnDataReceivedFuzzTest") { sources = [ "on_data_received_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/onerror_fuzzer/BUILD.gn b/test/commonfuzztest/onerror_fuzzer/BUILD.gn index 88eb9d5d9252acf21a9708d46560ae137b1ac2e5..29fbc7da6e10bb4b987412b7efc199b3409bc227 100644 --- a/test/commonfuzztest/onerror_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onerror_fuzzer/BUILD.gn @@ -43,7 +43,7 @@ ohos_fuzztest("OnErrorFuzzTest") { sources = [ "on_error_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/onfinish_fuzzer/BUILD.gn b/test/commonfuzztest/onfinish_fuzzer/BUILD.gn index ccdf45e2492113dc168f8966f1cf7762472d0c7e..e4af5d7c1c654db73fd8fc88be6bbed3adc9f8be 100644 --- a/test/commonfuzztest/onfinish_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onfinish_fuzzer/BUILD.gn @@ -43,7 +43,7 @@ ohos_fuzztest("OnFinishFuzzTest") { sources = [ "on_finish_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/onrequest_fuzzer/BUILD.gn b/test/commonfuzztest/onrequest_fuzzer/BUILD.gn index 94a50c7c0eb06b60261c20ffae80a264168b4e7b..882f222d2978f2c1ed0cf0a65ec5a3584650a7ec 100644 --- a/test/commonfuzztest/onrequest_fuzzer/BUILD.gn +++ b/test/commonfuzztest/onrequest_fuzzer/BUILD.gn @@ -44,7 +44,7 @@ ohos_fuzztest("OnRequestFuzzTest") { sources = [ "on_request_fuzzer.cpp" ] deps = [ - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/pinauth_fuzzer/BUILD.gn b/test/commonfuzztest/pinauth_fuzzer/BUILD.gn index b35c7bceb99beb3ac5221dcdc7374b1f01c6ecab..2f44029c318581d217e90c082120beef658162c6 100644 --- a/test/commonfuzztest/pinauth_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinauth_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("PinAuthFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn b/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn index edb277b775ac33945d444d4b974917526d62195a..49c296f45652b38e73046abfe754cabe7ebf8153 100644 --- a/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinauthui_fuzzer/BUILD.gn @@ -65,7 +65,7 @@ ohos_fuzztest("PinAuthUiFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/commonfuzztest/pinholder_fuzzer/BUILD.gn b/test/commonfuzztest/pinholder_fuzzer/BUILD.gn index ad3d330adf583537fe7745a000cb3698b6cd02df..d3c776b9b3084a3939224cd6bf4f114a6b445243 100644 --- a/test/commonfuzztest/pinholder_fuzzer/BUILD.gn +++ b/test/commonfuzztest/pinholder_fuzzer/BUILD.gn @@ -65,7 +65,7 @@ ohos_fuzztest("PinHolderFuzzTest") { deps = [ "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn b/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn index a0aec1889a5cbbe9ec494cead0ce95de1fa703d4..4089df8b2def80d6e65638fd853f2065d71ad303 100644 --- a/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/devicemanagerservice_fuzzer/BUILD.gn @@ -57,7 +57,7 @@ ohos_fuzztest("DeviceManagerServiceFuzzTest") { sources = [ "device_manager_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn b/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn index 79e46a79f917b292374d88b98f5e6c85d1ed47e0..4aa63a58a5ee685e46a74108c2a6d3a64a29a915 100644 --- a/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/deviceprofileconnector_fuzzer/BUILD.gn @@ -36,7 +36,7 @@ ohos_fuzztest("DeviceProfileConnectorFuzzTest") { deps = [ "${devicemanager_path}/commondependency:devicemanagerdependency", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn index b9d4a3da8650ac86eefc6bd41c8303033db89084..37a3d88e819e0ad0d8c7c6ce95182c935fb02cef 100644 --- a/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/getlocaldeviceinfo_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("GetLocalDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn b/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn index 5f55db91675089e3918f0fee3714bb3fb0fddfb9..cf13c0dd24a135b96836994b1cd7e00392304076 100644 --- a/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/gettrusteddevicelistservice_fuzzer/BUILD.gn @@ -57,7 +57,7 @@ ohos_fuzztest("GetTrustedDeviceListServiceFuzzTest") { sources = [ "get_trusted_devicelist_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn index 13ad91b39b00ea2825dd1582f76d044fbe843e6b..c152eaced4adf72e0e812f19322f10b959a5e0a6 100644 --- a/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverclientproxy_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("IpcServerClientProxyFuzzTest") { sources = [ "ipc_server_client_proxy_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${innerkits_path}/native_cpp:devicemanagersdk", ] diff --git a/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn index 7de171284ef50335bd4102c7ec90b5ecbbd9606d..be8b06245b42846e2bbc7327d707c7a698a5770a 100644 --- a/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverlistener_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("IpcServerListenerFuzzTest") { sources = [ "ipc_server_listener_fuzzer.cpp" ] - deps = [ "${devicemanager_path}/services/service:devicemanagerservice" ] + deps = [ "${devicemanager_path}/services/service:devicemanagerservicestatic" ] external_deps = [ "c_utils:utils", diff --git a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn index 737b7b1877742235e9f11e1c384f918d23f86c06..04220b6b69617bffdcd4ae1d756c926d65a0115b 100644 --- a/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/ipcserverstub_fuzzer/BUILD.gn @@ -59,7 +59,7 @@ ohos_fuzztest("IpcServerStubFuzzTest") { sources = [ "ipc_server_stub_fuzzer.cpp" ] - deps = [ "${devicemanager_path}/services/service:devicemanagerservice" ] + deps = [ "${devicemanager_path}/services/service:devicemanagerservicestatic" ] defines = [ "HI_LOG_ENABLE", diff --git a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn index 8368419a04e0cbc72ea52d5babac94d8883f29dd..ffeb35e9eb34f4c13b2b39110d615deacc70fed6 100644 --- a/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/notifyevent_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("NotifyEventFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn b/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn index 8e4e284ef6bf3c26a6f1206dc6eed7b7ed69c109..5bc45d684aa73ec53e8a979458d07817bd2a562c 100644 --- a/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn +++ b/test/servicesfuzztest/shiftlnngeardeviceservice_fuzzer/BUILD.gn @@ -57,7 +57,7 @@ ohos_fuzztest("ShiftLNNGearDeviceServiceFuzzTest") { sources = [ "shift_lnn_gear_device_service_fuzzer.cpp" ] deps = [ - "${devicemanager_path}/services/service:devicemanagerservice", + "${devicemanager_path}/services/service:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn index e032218e84c21c17abd1f76b890cad97a176c4c1..a93d3c086f118e9676d6c0d795cb978567a235c5 100644 --- a/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/closedmradarhelperobj_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("CloseDmRadarHelperObjFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn b/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn index 558005b021300fba101ccccc67e7ce6761804395..d9f8d3c13037b14d53300b5660c000bcd200f80a 100644 --- a/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onbytesreceived_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("OnBytesReceivedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn index f95facaf53b3a929e83bbbca301ce6d127118bb7..bf4538973e0474ce91385604fc3f99f398b5d474 100644 --- a/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onparameterchgcallback_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("OnParameterChgCallbackFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn b/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn index 251ac87975e25c68f026f249fc71d9da03240e51..14d25d57865b5731b1fd42f52c2dd21ad1b9cf57 100644 --- a/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsessionopened_fuzzer/BUILD.gn @@ -51,7 +51,7 @@ ohos_fuzztest("OnSessionOpenedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn index 0cb1e7b21b44b73884a1fd025c7f11c0eee448aa..dc80b49298a3b914ffc74bec86a29b391d7652ef 100644 --- a/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceinfochanged_fuzzer/BUILD.gn @@ -40,7 +40,7 @@ ohos_fuzztest("OnSoftbusDeviceInfoChangedFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn index ecf137944035fc7508ef06813c8c038e143da126..dfd2ecdcb2594a1c9c0e034c8dd08b2b3c4b3924 100644 --- a/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceoffline_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("OnSoftbusDeviceOfflineFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn index 049ffdb531a261a7c24f8c56fe979ab8ce2039cf..7df6bc67d939b07395367fe9d1a8f859bdaebb00 100644 --- a/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbusdeviceonline_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("OnSoftbusDeviceOnlineFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn index 6bc2757194f6a187d063771fca03e38f84b69865..85fb210753a838af7533cf128d81a717f38303c8 100644 --- a/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/onsoftbuslistenerdevicefound_fuzzer/BUILD.gn @@ -40,7 +40,7 @@ ohos_fuzztest("OnSoftbusListenerDeviceFoundFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn index 8a1a5e38592930c937c428165b104494745eed72..cc8899da0fd74be4157062bd43ab0a1c35efceed 100644 --- a/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/publishsoftbuslnn_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("PublishSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn index 731f97cc5737679abcf3e9616cd3a09d90b92c73..f09ad4bba3d839382af7371982c89bf5b185b142 100644 --- a/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/refreshsoftbuslnn_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("RefreshSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn b/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn index 7a89dc7d7d73e72ab660e9995f3166f11caade46..104934bc274091878f5a463afe0cc6002e12d3a6 100644 --- a/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbusconnectorregister_fuzzer/BUILD.gn @@ -45,7 +45,7 @@ ohos_fuzztest("SoftbusConnectorRegisterFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn index caea4d6ffcbdb8b8b55981e34309e53a688a64d9..27def9bcedd6430dfa9d6047a9a03d932d8932ff 100644 --- a/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbuslistenergetlocaldeviceinfo_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("SoftbusListenerGetLocalDeviceInfoFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn b/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn index 3d8a702068c499252d68c277e5bc6e783e49d869..774ab17e7b937634ef6a3b5684aa9a70a97c6cd7 100644 --- a/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/softbussessionobject_fuzzer/BUILD.gn @@ -46,7 +46,7 @@ ohos_fuzztest("SoftbusSessionObjectFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${utils_path}:devicemanagerutils", ] diff --git a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn index b69e49882096650e7e1f61fa65ec25440a0f5857..564aa76945f52f57a7e4c7f65fec4e67f6b8507b 100644 --- a/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn +++ b/test/softbusfuzztest/stoprefreshsoftbuslnn_fuzzer/BUILD.gn @@ -41,7 +41,7 @@ ohos_fuzztest("StopRefreshSoftbusLnnFuzzTest") { deps = [ "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index d47d3f153d1ddec39c957c5268e92ee68f733e52..0dbbaa60525097521e20cc504d85fc7ea7c29837 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -528,7 +528,7 @@ ohos_unittest("UTTest_mine_softbus_listener") { deps = [ ":device_manager_test_common", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${utils_path}:devicemanagerutils", ] @@ -1769,7 +1769,7 @@ ohos_static_library("device_manager_test_common") { "${devicemanager_path}/radar:devicemanagerradar", "${ext_path}/pin_auth:devicemanagerext_pin_auth", "${innerkits_path}/native_cpp:devicemanagersdk", - "${services_path}:devicemanagerservice", + "${services_path}:devicemanagerservicestatic", "${servicesimpl_path}:devicemanagerserviceimpl", "${softbuscache_parh}:dmdevicecache", "${utils_path}:devicemanagerutils", diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index 4e37e0fa6e6dcf5a54369a7dbd2b6ae5e4c782d2..4554fdcc468971b07cf6bd697324abc51191851a 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -29,7 +29,6 @@ using namespace testing; using namespace testing::ext; namespace OHOS { namespace DistributedHardware { -DM_IMPLEMENT_SINGLE_INSTANCE(DeviceManagerService); void DeviceManagerServiceTest::SetUp() { diff --git a/test/unittest/UTTest_device_manager_service_notify.cpp b/test/unittest/UTTest_device_manager_service_notify.cpp index 412c70aaa4ff70a76e0c7f6b037d1c037b4b1847..08e6123d765f0a7fda4ca13772745558109022e3 100644 --- a/test/unittest/UTTest_device_manager_service_notify.cpp +++ b/test/unittest/UTTest_device_manager_service_notify.cpp @@ -22,7 +22,6 @@ namespace OHOS { namespace DistributedHardware { -DM_IMPLEMENT_SINGLE_INSTANCE(DeviceManagerServiceNotify); void DeviceManagerServiceNotifyTest::SetUp() {} void DeviceManagerServiceNotifyTest::TearDown() {} diff --git a/test/unittest/mock/device_manager_service_mock.cpp b/test/unittest/mock/device_manager_service_mock.cpp index a6db438a686920ae7ed5cf985651ae175e4c75fe..50ab8b68057b562b3a85001ea71a8d4e191375f6 100644 --- a/test/unittest/mock/device_manager_service_mock.cpp +++ b/test/unittest/mock/device_manager_service_mock.cpp @@ -19,25 +19,24 @@ namespace OHOS { namespace DistributedHardware { -DM_IMPLEMENT_SINGLE_INSTANCE(DeviceManagerService); -bool DeviceManagerService::IsDMServiceImplReady() +bool DmDeviceManagerService::IsDMServiceImplReady() { - return DmDeviceManagerService::dmDeviceManagerService->IsDMServiceImplReady(); + return dmDeviceManagerService->IsDMServiceImplReady(); } -int32_t DeviceManagerService::GetTrustedDeviceList(const std::string &pkgName, std::vector &deviceList) +int32_t DmDeviceManagerService::GetTrustedDeviceList(const std::string &pkgName, std::vector &deviceList) { - return DmDeviceManagerService::dmDeviceManagerService->GetTrustedDeviceList(pkgName, deviceList); + return dmDeviceManagerService->GetTrustedDeviceList(pkgName, deviceList); } -bool DeviceManagerService::IsDMServiceAdapterResidentLoad() +bool DmDeviceManagerService::IsDMServiceAdapterResidentLoad() { - return DmDeviceManagerService::dmDeviceManagerService->IsDMServiceAdapterResidentLoad(); + return dmDeviceManagerService->IsDMServiceAdapterResidentLoad(); } -bool DeviceManagerService::IsDMServiceAdapterSoLoaded() +bool DmDeviceManagerService::IsDMServiceAdapterSoLoaded() { - return DmDeviceManagerService::dmDeviceManagerService->IsDMServiceAdapterSoLoaded(); + return dmDeviceManagerService->IsDMServiceAdapterSoLoaded(); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/dm_comm_tool_mock.cpp b/test/unittest/mock/dm_comm_tool_mock.cpp index 5c783d5613c3648ed96515dcb1f65acf1572aa05..0c10bfba9606ffa362415dcf4894771da20990cc 100644 --- a/test/unittest/mock/dm_comm_tool_mock.cpp +++ b/test/unittest/mock/dm_comm_tool_mock.cpp @@ -19,10 +19,10 @@ namespace OHOS { namespace DistributedHardware { -int32_t DMCommTool::SendUserIds(const std::string rmtNetworkId, +int32_t DmDMCommTool::SendUserIds(const std::string rmtNetworkId, const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) { - return DmDMCommTool::dmDMCommTool->SendUserIds(rmtNetworkId, foregroundUserIds, backgroundUserIds); + return dmDMCommTool->SendUserIds(rmtNetworkId, foregroundUserIds, backgroundUserIds); } } // namespace DistributedHardware diff --git a/test/unittest/mock/ipc_server_listener_mock.cpp b/test/unittest/mock/ipc_server_listener_mock.cpp index b46d8e232b8ab6d231c5f3b3f13a8ef67d866941..2f2dd1d674509bf8b4889dc1363d12fb075a0654 100644 --- a/test/unittest/mock/ipc_server_listener_mock.cpp +++ b/test/unittest/mock/ipc_server_listener_mock.cpp @@ -19,14 +19,14 @@ namespace OHOS { namespace DistributedHardware { -std::vector IpcServerListener::GetAllProcessInfo() +std::vector DmIpcServerListener::GetAllProcessInfo() { - return DmIpcServerListener::dmIpcServerListener->GetAllProcessInfo(); + return dmIpcServerListener->GetAllProcessInfo(); } -std::set IpcServerListener::GetSystemSA() +std::set DmIpcServerListener::GetSystemSA() { - return DmIpcServerListener::dmIpcServerListener->GetSystemSA(); + return dmIpcServerListener->GetSystemSA(); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/ipc_server_listener_mock.h b/test/unittest/mock/ipc_server_listener_mock.h index 951be74c4ba2809d9e977c56eb4894dec2d91c88..8fc6da2f059354717757e9099e52ce8e1733c146 100644 --- a/test/unittest/mock/ipc_server_listener_mock.h +++ b/test/unittest/mock/ipc_server_listener_mock.h @@ -26,7 +26,7 @@ class DmIpcServerListener { public: virtual ~DmIpcServerListener() = default; public: - virtual std::vector GetAllProcessInfo() = 0; + virtual std::vector<::OHOS::DistributedHardware::ProcessInfo> GetAllProcessInfo() = 0; virtual std::set GetSystemSA() = 0; public: static inline std::shared_ptr dmIpcServerListener = nullptr; diff --git a/test/unittest/mock/permission_manager_mock.cpp b/test/unittest/mock/permission_manager_mock.cpp index c596d17f36bdaa88d294442e5cea96c9c3189297..088b6ece269f9893b26f51c1c1b6faab4866d641 100644 --- a/test/unittest/mock/permission_manager_mock.cpp +++ b/test/unittest/mock/permission_manager_mock.cpp @@ -19,15 +19,14 @@ namespace OHOS { namespace DistributedHardware { -DM_IMPLEMENT_SINGLE_INSTANCE(PermissionManager); -bool PermissionManager::CheckInterfacePermission(const std::string &interfaceName) +bool DmPermissionManager::CheckInterfacePermission(const std::string &interfaceName) { - return DmPermissionManager::dmPermissionManager->CheckInterfacePermission(interfaceName); + return dmPermissionManager->CheckInterfacePermission(interfaceName); } -int32_t PermissionManager::GetCallerProcessName(std::string &processName) +int32_t DmPermissionManager::GetCallerProcessName(std::string &processName) { - return DmPermissionManager::dmPermissionManager->GetCallerProcessName(processName); + return dmPermissionManager->GetCallerProcessName(processName); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/softbus_listener_mock.cpp b/test/unittest/mock/softbus_listener_mock.cpp index eb2a79099b3c840e8d793632c46dcf95c2bd897f..eb60104baacd59dfd89043655bea5fae3133bc73 100644 --- a/test/unittest/mock/softbus_listener_mock.cpp +++ b/test/unittest/mock/softbus_listener_mock.cpp @@ -19,71 +19,71 @@ namespace OHOS { namespace DistributedHardware { -int32_t SoftbusListener::ShiftLNNGear(bool isWakeUp, const std::string &callerId) +int32_t DmSoftbusListener::ShiftLNNGear(bool isWakeUp, const std::string &callerId) { - return DmSoftbusListener::dmSoftbusListener->ShiftLNNGear(isWakeUp, callerId); + return dmSoftbusListener->ShiftLNNGear(isWakeUp, callerId); } -int32_t SoftbusListener::GetUdidByNetworkId(const char *networkId, std::string &udid) +int32_t DmSoftbusListener::GetUdidByNetworkId(const char *networkId, std::string &udid) { - return DmSoftbusListener::dmSoftbusListener->GetUdidByNetworkId(networkId, udid); + return dmSoftbusListener->GetUdidByNetworkId(networkId, udid); } -int32_t SoftbusListener::GetDeviceSecurityLevel(const char *networkId, int32_t &securityLevel) +int32_t DmSoftbusListener::GetDeviceSecurityLevel(const char *networkId, int32_t &securityLevel) { - return DmSoftbusListener::dmSoftbusListener->GetDeviceSecurityLevel(networkId, securityLevel); + return dmSoftbusListener->GetDeviceSecurityLevel(networkId, securityLevel); } -int32_t SoftbusListener::GetDeviceInfo(const std::string &networkId, DmDeviceInfo &info) +int32_t DmSoftbusListener::GetDeviceInfo(const std::string &networkId, DmDeviceInfo &info) { - return DmSoftbusListener::dmSoftbusListener->GetDeviceInfo(networkId, info); + return dmSoftbusListener->GetDeviceInfo(networkId, info); } -int32_t SoftbusListener::GetUuidByNetworkId(const char *networkId, std::string &uuid) +int32_t DmSoftbusListener::GetUuidByNetworkId(const char *networkId, std::string &uuid) { - return DmSoftbusListener::dmSoftbusListener->GetUuidByNetworkId(networkId, uuid); + return dmSoftbusListener->GetUuidByNetworkId(networkId, uuid); } -int32_t SoftbusListener::GetTargetInfoFromCache(const std::string &deviceId, PeerTargetId &targetId, +int32_t DmSoftbusListener::GetTargetInfoFromCache(const std::string &deviceId, PeerTargetId &targetId, ConnectionAddrType &addrType) { - return DmSoftbusListener::dmSoftbusListener->GetTargetInfoFromCache(deviceId, targetId, addrType); + return dmSoftbusListener->GetTargetInfoFromCache(deviceId, targetId, addrType); } -int32_t SoftbusListener::GetTrustedDeviceList(std::vector &deviceInfoList) +int32_t DmSoftbusListener::GetTrustedDeviceList(std::vector &deviceInfoList) { - return DmSoftbusListener::dmSoftbusListener->GetTrustedDeviceList(deviceInfoList); + return dmSoftbusListener->GetTrustedDeviceList(deviceInfoList); } -int32_t SoftbusListener::GetLocalDeviceInfo(DmDeviceInfo &deviceInfo) +int32_t DmSoftbusListener::GetLocalDeviceInfo(DmDeviceInfo &deviceInfo) { - return DmSoftbusListener::dmSoftbusListener->GetLocalDeviceInfo(deviceInfo); + return dmSoftbusListener->GetLocalDeviceInfo(deviceInfo); } -int32_t SoftbusListener::GetDeviceScreenStatus(const char *networkId, int32_t &screenStatus) +int32_t DmSoftbusListener::GetDeviceScreenStatus(const char *networkId, int32_t &screenStatus) { - return DmSoftbusListener::dmSoftbusListener->GetDeviceScreenStatus(networkId, screenStatus); + return dmSoftbusListener->GetDeviceScreenStatus(networkId, screenStatus); } -int32_t SoftbusListener::GetIPAddrTypeFromCache(const std::string &deviceId, const std::string &ip, +int32_t DmSoftbusListener::GetIPAddrTypeFromCache(const std::string &deviceId, const std::string &ip, ConnectionAddrType &addrType) { - return DmSoftbusListener::dmSoftbusListener->GetIPAddrTypeFromCache(deviceId, ip, addrType); + return dmSoftbusListener->GetIPAddrTypeFromCache(deviceId, ip, addrType); } -int32_t SoftbusListener::GetNetworkTypeByNetworkId(const char *networkId, int32_t &networkType) +int32_t DmSoftbusListener::GetNetworkTypeByNetworkId(const char *networkId, int32_t &networkType) { - return DmSoftbusListener::dmSoftbusListener->GetNetworkTypeByNetworkId(networkId, networkType); + return dmSoftbusListener->GetNetworkTypeByNetworkId(networkId, networkType); } -int32_t SoftbusListener::SetLocalDisplayName(const std::string &displayName) +int32_t DmSoftbusListener::SetLocalDisplayName(const std::string &displayName) { - return DmSoftbusListener::dmSoftbusListener->SetLocalDisplayName(displayName); + return dmSoftbusListener->SetLocalDisplayName(displayName); } -int32_t SoftbusListener::GetUdidFromDp(const std::string &udidHash, std::string &udid) +int32_t DmSoftbusListener::GetUdidFromDp(const std::string &udidHash, std::string &udid) { - return DmSoftbusListener::dmSoftbusListener->GetUdidFromDp(udidHash, udid); + return dmSoftbusListener->GetUdidFromDp(udidHash, udid); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file