From 93acc6c201957c75514911deb45e12795cc299cf Mon Sep 17 00:00:00 2001 From: wangyb0625 Date: Thu, 24 Mar 2022 18:02:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=BA=90=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyb0625 --- README_zh.md | 2 -- common/include/ipc/model/ipc_get_dmfaparam_rsp.h | 2 +- common/include/ipc/model/ipc_get_info_by_network_req.h | 2 +- common/include/ipc/model/ipc_get_info_by_network_rsp.h | 2 +- common/include/ipc/model/ipc_get_local_device_info_rsp.h | 2 +- common/include/single_instance.h | 3 +-- display/entry/build.gradle | 1 - .../kits/js/include/native_devicemanager_js.h | 1 - .../devicemanagerservice/include/auth/hichain_connector.h | 2 +- .../devicemanagerservice/src/auth/hichain_connector.cpp | 2 +- .../services/devicemanagerservice/src/message/msg_codec.cpp | 1 - .../devicemanagerservice/src/message/msg_request_auth.cpp | 3 --- .../devicemanagerservice/src/requestauth/auth_manager.cpp | 1 - ext/profile/include/profile_connector.h | 2 +- ext/profile/include/profile_connector_callback.h | 2 +- .../inner_kits/native_cpp/include/dm_app_image_info.h | 2 +- interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h | 2 +- .../inner_kits/native_cpp/include/ipc/ipc_client_proxy.h | 2 +- .../native_cpp/include/ipc/standard/ipc_client_manager.h | 2 +- interfaces/kits/js/include/dm_native_event.h | 3 +-- interfaces/kits/js/src/dm_native_event.cpp | 2 +- .../devicemanagerservice/include/config/dm_config_manager.h | 2 +- services/devicemanagerservice/include/config/json_config.h | 2 +- .../dependency/commonevent/dm_common_event_manager.h | 2 +- .../dependency/multipleuser/multiple_user_connector.h | 2 +- .../src/authentication/auth_message_processor.cpp | 1 - .../devicemanagerservice/src/config/dm_config_manager.cpp | 2 +- .../src/dependency/commonevent/dm_common_event_manager.cpp | 6 +++--- .../src/dependency/multipleuser/multiple_user_connector.cpp | 2 +- .../src/ipc/lite/ipc_server_listenermgr.cpp | 2 +- .../devicemanagerservice/src/ipc/lite/ipc_server_main.cpp | 2 +- test/unittest/UTTest_auth_message_processor.h | 2 +- test/unittest/UTTest_device_manager_service.cpp | 2 +- test/unittest/UTTest_device_manager_service.h | 2 +- test/unittest/UTTest_device_manager_service_listener.cpp | 4 ++-- test/unittest/UTTest_device_manager_service_listener.h | 2 +- test/unittest/UTTest_dm_device_info_manager.cpp | 4 ++-- test/unittest/UTTest_dm_device_info_manager.h | 2 +- test/unittest/UTTest_dm_device_state_manager.cpp | 2 +- test/unittest/UTTest_dm_device_state_manager.h | 2 +- test/unittest/UTTest_softbus_connector.cpp | 2 +- test/unittest/UTTest_softbus_session.h | 2 +- test/unittest/mock/ipc_server_listener.h | 2 +- test/unittest/mock/parameter.h | 3 +-- utils/include/dm_anonymous.h | 3 +-- utils/include/ipc/lite/ipc_cmd_register.h | 2 +- utils/include/ipc/standard/ipc_cmd_register.h | 2 +- 47 files changed, 44 insertions(+), 58 deletions(-) diff --git a/README_zh.md b/README_zh.md index 5df737b47..e3f963cb8 100644 --- a/README_zh.md +++ b/README_zh.md @@ -217,8 +217,6 @@ dmClass.unAuthenticateDevice(this.deviceInfo); 将devicemanager/display工程导入DevEco Studio 2.2 Beta1，复制display目录下的@ohos.distributedHardware.deviceManager.d.ts文件到Sdk\js\2.2.0.1\api\common目录下，进行编译构建及运行调试. - DevEco Studio使用方法请参考[DevEco Studio使用说明](https://developer.harmonyos.com/cn/docs/documentation/doc-guides/tools_overview-0000001053582387)。 - - 编译环境依赖：IDE 2.2 SDK6 - DeviceManager_UI.hap存放位置：[applications_hap仓库](https://gitee.com/openharmony/applications_hap) diff --git a/common/include/ipc/model/ipc_get_dmfaparam_rsp.h b/common/include/ipc/model/ipc_get_dmfaparam_rsp.h index 1267c2ef2..3ddd3fc60 100644 --- a/common/include/ipc/model/ipc_get_dmfaparam_rsp.h +++ b/common/include/ipc/model/ipc_get_dmfaparam_rsp.h @@ -40,4 +40,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DEVICE_MANAGER_IPC_GET_DM_FA_PARAM_RSP_H \ No newline at end of file +#endif // OHOS_DEVICE_MANAGER_IPC_GET_DM_FA_PARAM_RSP_H diff --git a/common/include/ipc/model/ipc_get_info_by_network_req.h b/common/include/ipc/model/ipc_get_info_by_network_req.h index 60e250c32..ad9b04c9f 100644 --- a/common/include/ipc/model/ipc_get_info_by_network_req.h +++ b/common/include/ipc/model/ipc_get_info_by_network_req.h @@ -39,4 +39,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DEVICE_MANAGER_IPC_GET_INFO_BY_NETWORK_REQ_H \ No newline at end of file +#endif // OHOS_DEVICE_MANAGER_IPC_GET_INFO_BY_NETWORK_REQ_H diff --git a/common/include/ipc/model/ipc_get_info_by_network_rsp.h b/common/include/ipc/model/ipc_get_info_by_network_rsp.h index 6c1e0ea6e..ab702de74 100644 --- a/common/include/ipc/model/ipc_get_info_by_network_rsp.h +++ b/common/include/ipc/model/ipc_get_info_by_network_rsp.h @@ -51,4 +51,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DEVICE_MANAGER_IPC_GET_INFO_BY_NETWORK_RSP_H \ No newline at end of file +#endif // OHOS_DEVICE_MANAGER_IPC_GET_INFO_BY_NETWORK_RSP_H diff --git a/common/include/ipc/model/ipc_get_local_device_info_rsp.h b/common/include/ipc/model/ipc_get_local_device_info_rsp.h index a7d08072c..62aa72aa4 100644 --- a/common/include/ipc/model/ipc_get_local_device_info_rsp.h +++ b/common/include/ipc/model/ipc_get_local_device_info_rsp.h @@ -40,4 +40,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_IPC_GET_LOCAL_DEVICE_INFO_RSP_H \ No newline at end of file +#endif // OHOS_DM_IPC_GET_LOCAL_DEVICE_INFO_RSP_H diff --git a/common/include/single_instance.h b/common/include/single_instance.h index 5480fd674..b420f0234 100644 --- a/common/include/single_instance.h +++ b/common/include/single_instance.h @@ -42,5 +42,4 @@ private: \ } }; // namespace DistributedHardware }; // namespace OHOS - -#endif // OHOS_DM_SINGLE_INSTANCE_H \ No newline at end of file +#endif // OHOS_DM_SINGLE_INSTANCE_H diff --git a/display/entry/build.gradle b/display/entry/build.gradle index 127dec406..f83acd766 100644 --- a/display/entry/build.gradle +++ b/display/entry/build.gradle @@ -15,7 +15,6 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' -//For instructions on signature configuration, see https://developer.harmonyos.com/cn/docs/documentation/doc-guides/ide_debug_device-0000001053822404#section1112183053510 ohos { compileSdkVersion 6 defaultConfig { diff --git a/ext/mini/interfaces_mini/kits/js/include/native_devicemanager_js.h b/ext/mini/interfaces_mini/kits/js/include/native_devicemanager_js.h index 1268f4c0c..94dfb108e 100644 --- a/ext/mini/interfaces_mini/kits/js/include/native_devicemanager_js.h +++ b/ext/mini/interfaces_mini/kits/js/include/native_devicemanager_js.h @@ -23,7 +23,6 @@ #include "dm_device_info.h" #include "dm_subscribe_info.h" #include "nlohmann/json.hpp" -#include "dm_device_info.h" #include "jsi.h" namespace OHOS { diff --git a/ext/mini/services/devicemanagerservice/include/auth/hichain_connector.h b/ext/mini/services/devicemanagerservice/include/auth/hichain_connector.h index 9c9d4f511..14032ec06 100644 --- a/ext/mini/services/devicemanagerservice/include/auth/hichain_connector.h +++ b/ext/mini/services/devicemanagerservice/include/auth/hichain_connector.h @@ -89,7 +89,7 @@ private: private: std::shared_ptr hichainConnectorCallback_ = nullptr; const DeviceGroupManager *deviceGroupManager_ = nullptr; - DeviceAuthCallback deviceAuthCallback_ ; + DeviceAuthCallback deviceAuthCallback_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/ext/mini/services/devicemanagerservice/src/auth/hichain_connector.cpp b/ext/mini/services/devicemanagerservice/src/auth/hichain_connector.cpp index 6fa2b1966..2829799d7 100644 --- a/ext/mini/services/devicemanagerservice/src/auth/hichain_connector.cpp +++ b/ext/mini/services/devicemanagerservice/src/auth/hichain_connector.cpp @@ -250,7 +250,7 @@ void HichainConnector::OnMemberJoin(int64_t requestId, int32_t status) } if (hichainConnectorCallback_ == nullptr) { - DMLOG(DM_LOG_ERROR, "HichainConnector::OnMemberJoin hichainConnectorCallback_ not registe."); + DMLOG(DM_LOG_ERROR, "HichainConnector::OnMemberJoin hichainConnectorCallback_ not register."); return; } hichainConnectorCallback_->OnMemberJoin(requestId, status); diff --git a/ext/mini/services/devicemanagerservice/src/message/msg_codec.cpp b/ext/mini/services/devicemanagerservice/src/message/msg_codec.cpp index 52362efc5..23b9728e4 100644 --- a/ext/mini/services/devicemanagerservice/src/message/msg_codec.cpp +++ b/ext/mini/services/devicemanagerservice/src/message/msg_codec.cpp @@ -18,7 +18,6 @@ #include "msg_head.h" #include "constants.h" -#include "device_manager_log.h" #include "device_manager_errno.h" namespace OHOS { diff --git a/ext/mini/services/devicemanagerservice/src/message/msg_request_auth.cpp b/ext/mini/services/devicemanagerservice/src/message/msg_request_auth.cpp index c6ca42340..6a2aba58f 100644 --- a/ext/mini/services/devicemanagerservice/src/message/msg_request_auth.cpp +++ b/ext/mini/services/devicemanagerservice/src/message/msg_request_auth.cpp @@ -20,13 +20,10 @@ #include "constants.h" #include "encrypt_utils.h" #include "device_manager_errno.h" -#include "device_manager_log.h" -#include "encrypt_utils.h" #include "msg_request_auth.h" #include "parameter.h" #include "softbus_session.h" #include "softbus_bus_center.h" -#include "msg_request_auth.h" namespace OHOS { namespace DistributedHardware { diff --git a/ext/mini/services/devicemanagerservice/src/requestauth/auth_manager.cpp b/ext/mini/services/devicemanagerservice/src/requestauth/auth_manager.cpp index a73618ae0..d652d0108 100644 --- a/ext/mini/services/devicemanagerservice/src/requestauth/auth_manager.cpp +++ b/ext/mini/services/devicemanagerservice/src/requestauth/auth_manager.cpp @@ -19,7 +19,6 @@ #include "constants.h" #include "msg_codec.h" #include "device_manager_log.h" -#include "msg_codec.h" #include "device_manager_errno.h" #include "softbus_session.h" #include "encrypt_utils.h" diff --git a/ext/profile/include/profile_connector.h b/ext/profile/include/profile_connector.h index 69d5b35b0..ee5fc8718 100755 --- a/ext/profile/include/profile_connector.h +++ b/ext/profile/include/profile_connector.h @@ -46,4 +46,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_PROFILE_CONNECTOR_H \ No newline at end of file +#endif // OHOS_DM_PROFILE_CONNECTOR_H diff --git a/ext/profile/include/profile_connector_callback.h b/ext/profile/include/profile_connector_callback.h index 3eeec5704..b7bebfff5 100644 --- a/ext/profile/include/profile_connector_callback.h +++ b/ext/profile/include/profile_connector_callback.h @@ -25,4 +25,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_PROFILE_CONNECTOR_CALLBACK_H \ No newline at end of file +#endif // OHOS_DM_PROFILE_CONNECTOR_CALLBACK_H diff --git a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h index 676def35c..b72efb2af 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_app_image_info.h @@ -176,7 +176,7 @@ private: int32_t appIconLen { 0 }; uint8_t *appIcon { nullptr }; int32_t appThumbnailLen { 0 }; - uint8_t *appThumbnail { nullptr } ; + uint8_t *appThumbnail { nullptr }; const int32_t ICON_MAX_LEN = 32 * 1024; const int32_t THUMB_MAX_LEN = 153 * 1024; }; diff --git a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h index 8f2b0074a..b608df8ec 100644 --- a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h +++ b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client.h @@ -35,4 +35,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_IPC_CLIENT_H \ No newline at end of file +#endif // OHOS_DM_IPC_CLIENT_H diff --git a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h index 9325f68c4..452e7e200 100644 --- a/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h +++ b/interfaces/inner_kits/native_cpp/include/ipc/ipc_client_proxy.h @@ -41,4 +41,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_IPC_CLIENT_PROXY_H \ No newline at end of file +#endif // OHOS_DM_IPC_CLIENT_PROXY_H 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 abc5f0acf..859bd50ba 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 @@ -57,4 +57,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_IPC_CLIENT_MANAGER_H \ No newline at end of file +#endif // OHOS_DM_IPC_CLIENT_MANAGER_H diff --git a/interfaces/kits/js/include/dm_native_event.h b/interfaces/kits/js/include/dm_native_event.h index 2eaea548a..16ce9ce34 100644 --- a/interfaces/kits/js/include/dm_native_event.h +++ b/interfaces/kits/js/include/dm_native_event.h @@ -41,5 +41,4 @@ protected: napi_ref thisVarRef_; std::map> eventMap_; }; - -#endif /* OHOS_DM_NATIVE_EVENT_H */ \ No newline at end of file +#endif // OHOS_DM_NATIVE_EVENT_H diff --git a/interfaces/kits/js/src/dm_native_event.cpp b/interfaces/kits/js/src/dm_native_event.cpp index f06dbd1b1..12e85c218 100644 --- a/interfaces/kits/js/src/dm_native_event.cpp +++ b/interfaces/kits/js/src/dm_native_event.cpp @@ -103,4 +103,4 @@ void DmNativeEvent::OnEvent(const std::string &eventType, size_t argc, const nap return; } napi_close_handle_scope(env_, scope); -} \ No newline at end of file +} diff --git a/services/devicemanagerservice/include/config/dm_config_manager.h b/services/devicemanagerservice/include/config/dm_config_manager.h index f131f41a3..0f9787056 100644 --- a/services/devicemanagerservice/include/config/dm_config_manager.h +++ b/services/devicemanagerservice/include/config/dm_config_manager.h @@ -82,4 +82,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_OHOS_DM_CONFIG_MANAGER_H \ No newline at end of file +#endif // OHOS_OHOS_DM_CONFIG_MANAGER_H diff --git a/services/devicemanagerservice/include/config/json_config.h b/services/devicemanagerservice/include/config/json_config.h index 817af97cb..5160bd4ce 100644 --- a/services/devicemanagerservice/include/config/json_config.h +++ b/services/devicemanagerservice/include/config/json_config.h @@ -93,4 +93,4 @@ const std::string authJsonConfigString = })"; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_OHOS_DM_JSON_CONFIG_H \ No newline at end of file +#endif // OHOS_OHOS_DM_JSON_CONFIG_H diff --git a/services/devicemanagerservice/include/dependency/commonevent/dm_common_event_manager.h b/services/devicemanagerservice/include/dependency/commonevent/dm_common_event_manager.h index 2f147ebc0..43e2e4a0b 100644 --- a/services/devicemanagerservice/include/dependency/commonevent/dm_common_event_manager.h +++ b/services/devicemanagerservice/include/dependency/commonevent/dm_common_event_manager.h @@ -67,4 +67,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_EVENT_MANAGER_ADAPT_H \ No newline at end of file +#endif // OHOS_EVENT_MANAGER_ADAPT_H diff --git a/services/devicemanagerservice/include/dependency/multipleuser/multiple_user_connector.h b/services/devicemanagerservice/include/dependency/multipleuser/multiple_user_connector.h index d56fce8d3..9dd46141b 100644 --- a/services/devicemanagerservice/include/dependency/multipleuser/multiple_user_connector.h +++ b/services/devicemanagerservice/include/dependency/multipleuser/multiple_user_connector.h @@ -30,4 +30,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_MULTIPLE_USER_CONNECTOR_H \ No newline at end of file +#endif // OHOS_DM_MULTIPLE_USER_CONNECTOR_H diff --git a/services/devicemanagerservice/src/authentication/auth_message_processor.cpp b/services/devicemanagerservice/src/authentication/auth_message_processor.cpp index a9bd110b9..71e8c59b8 100644 --- a/services/devicemanagerservice/src/authentication/auth_message_processor.cpp +++ b/services/devicemanagerservice/src/authentication/auth_message_processor.cpp @@ -128,7 +128,6 @@ void AuthMessageProcessor::CreateResponseAuthMessage(nlohmann::json &json) json[TAG_REPLY] = authResponseContext_->reply; json[TAG_DEVICE_ID] = authResponseContext_->deviceId; json[TAG_TOKEN] = authResponseContext_->token; - LOGI("AuthMessageProcessor::ParseAuthResponseMessage %s", authResponseContext_->deviceId.c_str()); if (authResponseContext_->reply == 0) { std::string groupId = authResponseContext_->groupId; LOGI("AuthMessageProcessor::CreateSimpleMessage groupId %d", groupId.c_str()); diff --git a/services/devicemanagerservice/src/config/dm_config_manager.cpp b/services/devicemanagerservice/src/config/dm_config_manager.cpp index 6c0a8fc95..01266edef 100644 --- a/services/devicemanagerservice/src/config/dm_config_manager.cpp +++ b/services/devicemanagerservice/src/config/dm_config_manager.cpp @@ -296,4 +296,4 @@ void DmConfigManager::GetAuthAdapter(std::map callbackQueueMutexLock(callbackQueueMutex_); if (callbackQueue_.size() > COMMON_CALLBACK_MAX_SIZE) { LOGE("event callback Queue is too long"); @@ -135,4 +135,4 @@ void DmCommonEventManager::EventSubscriber::OnReceiveEvent(const CommonEventData notEmpty_.notify_one(); } } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/devicemanagerservice/src/dependency/multipleuser/multiple_user_connector.cpp b/services/devicemanagerservice/src/dependency/multipleuser/multiple_user_connector.cpp index cbdae88d9..e1136f07b 100644 --- a/services/devicemanagerservice/src/dependency/multipleuser/multiple_user_connector.cpp +++ b/services/devicemanagerservice/src/dependency/multipleuser/multiple_user_connector.cpp @@ -50,4 +50,4 @@ int32_t MultipleUserConnector::GetSwitchOldUserId(void) return oldUserId_; } } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/devicemanagerservice/src/ipc/lite/ipc_server_listenermgr.cpp b/services/devicemanagerservice/src/ipc/lite/ipc_server_listenermgr.cpp index 5e7871602..f8537b0e2 100644 --- a/services/devicemanagerservice/src/ipc/lite/ipc_server_listenermgr.cpp +++ b/services/devicemanagerservice/src/ipc/lite/ipc_server_listenermgr.cpp @@ -62,4 +62,4 @@ const std::map &IpcServerListenermgr::GetAllListeners( return dmListenerMap_; } } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/devicemanagerservice/src/ipc/lite/ipc_server_main.cpp b/services/devicemanagerservice/src/ipc/lite/ipc_server_main.cpp index 0f808c289..1b9e3aae5 100644 --- a/services/devicemanagerservice/src/ipc/lite/ipc_server_main.cpp +++ b/services/devicemanagerservice/src/ipc/lite/ipc_server_main.cpp @@ -24,4 +24,4 @@ int32_t main(int32_t argc, char *argv[]) pause(); } return 0; -} \ No newline at end of file +} diff --git a/test/unittest/UTTest_auth_message_processor.h b/test/unittest/UTTest_auth_message_processor.h index 810ffb85a..b802473e6 100644 --- a/test/unittest/UTTest_auth_message_processor.h +++ b/test/unittest/UTTest_auth_message_processor.h @@ -33,4 +33,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DEVICE_MESSAGE_TEST_H \ No newline at end of file +#endif // OHOS_DEVICE_MESSAGE_TEST_H diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index 88f092812..2932047a9 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -194,7 +194,7 @@ HWTEST_F(DeviceManagerServiceTest, GetTrustedDeviceList_001, testing::ext::TestS /** * @tc.name: GetTrustedDeviceList_002 - * @tc.desc:Set the intFlag of GetTrustedDeviceList to true and pkgName = null ; The return value is DM_INPUT_PARA_EMPTY + * @tc.desc:Set the intFlag of GetTrustedDeviceList to true and pkgName = null; The return value is DM_INPUT_PARA_EMPTY * @tc.type: FUNC * @tc.require: AR000GHSJK */ diff --git a/test/unittest/UTTest_device_manager_service.h b/test/unittest/UTTest_device_manager_service.h index e59ad368c..59e92293e 100644 --- a/test/unittest/UTTest_device_manager_service.h +++ b/test/unittest/UTTest_device_manager_service.h @@ -41,4 +41,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/test/unittest/UTTest_device_manager_service_listener.cpp b/test/unittest/UTTest_device_manager_service_listener.cpp index e36129751..a1b270a9d 100644 --- a/test/unittest/UTTest_device_manager_service_listener.cpp +++ b/test/unittest/UTTest_device_manager_service_listener.cpp @@ -107,6 +107,6 @@ HWTEST_F(DeviceManagerServiceListenerTest, OnVerifyAuthResult_001, testing::ext: std::string ret = pReq->GetDeviceId(); EXPECT_EQ(ret, deviceId); } -} // namespace +} } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_service_listener.h b/test/unittest/UTTest_device_manager_service_listener.h index 5e314716a..58c013aa1 100644 --- a/test/unittest/UTTest_device_manager_service_listener.h +++ b/test/unittest/UTTest_device_manager_service_listener.h @@ -39,4 +39,4 @@ public: } // namespace OHOS #undef private #undef protected -#endif \ No newline at end of file +#endif diff --git a/test/unittest/UTTest_dm_device_info_manager.cpp b/test/unittest/UTTest_dm_device_info_manager.cpp index 148dd055f..60f5649f8 100644 --- a/test/unittest/UTTest_dm_device_info_manager.cpp +++ b/test/unittest/UTTest_dm_device_info_manager.cpp @@ -54,6 +54,6 @@ HWTEST_F(DeviceManagerImplTest, DmDeviceInfoManager_001, testing::ext::TestSize. std::shared_ptr p = std::make_shared(softbusConnector); ASSERT_NE(p, nullptr); } -} // namespace +} } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/test/unittest/UTTest_dm_device_info_manager.h b/test/unittest/UTTest_dm_device_info_manager.h index c0b67f339..cd1360c1b 100644 --- a/test/unittest/UTTest_dm_device_info_manager.h +++ b/test/unittest/UTTest_dm_device_info_manager.h @@ -39,4 +39,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/test/unittest/UTTest_dm_device_state_manager.cpp b/test/unittest/UTTest_dm_device_state_manager.cpp index 6fa9316d3..c9f1269e7 100644 --- a/test/unittest/UTTest_dm_device_state_manager.cpp +++ b/test/unittest/UTTest_dm_device_state_manager.cpp @@ -203,6 +203,6 @@ HWTEST_F(DmDeviceStateManagerTest, RegisterSoftbusStateCallback_001, testing::ex int ret = dmDeviceStateManager->RegisterSoftbusStateCallback(); EXPECT_EQ(ret, DM_OK); } -} // namespace +} } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_dm_device_state_manager.h b/test/unittest/UTTest_dm_device_state_manager.h index 7bbf2fb95..d01d2500d 100644 --- a/test/unittest/UTTest_dm_device_state_manager.h +++ b/test/unittest/UTTest_dm_device_state_manager.h @@ -35,4 +35,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/test/unittest/UTTest_softbus_connector.cpp b/test/unittest/UTTest_softbus_connector.cpp index dc879c96f..9a22ec889 100644 --- a/test/unittest/UTTest_softbus_connector.cpp +++ b/test/unittest/UTTest_softbus_connector.cpp @@ -315,6 +315,6 @@ HWTEST_F(SoftbusConnectorTest, CovertNodeBasicInfoToDmDevice_001, testing::ext:: int ret = softbusConnector->CovertNodeBasicInfoToDmDevice(nodeBasicInfo, dmDeviceInfo); EXPECT_EQ(ret, DM_OK); } -} // namespace +} } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_softbus_session.h b/test/unittest/UTTest_softbus_session.h index d1c7b6c85..8a915a54e 100644 --- a/test/unittest/UTTest_softbus_session.h +++ b/test/unittest/UTTest_softbus_session.h @@ -45,4 +45,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS -#endif \ No newline at end of file +#endif diff --git a/test/unittest/mock/ipc_server_listener.h b/test/unittest/mock/ipc_server_listener.h index 9493426b8..f125343e3 100644 --- a/test/unittest/mock/ipc_server_listener.h +++ b/test/unittest/mock/ipc_server_listener.h @@ -35,4 +35,4 @@ public: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_IPC_SERVER_LISTENER_H \ No newline at end of file +#endif // OHOS_DM_IPC_SERVER_LISTENER_H diff --git a/test/unittest/mock/parameter.h b/test/unittest/mock/parameter.h index 154104711..aa8a706a1 100644 --- a/test/unittest/mock/parameter.h +++ b/test/unittest/mock/parameter.h @@ -35,5 +35,4 @@ int GetDevUdid(char *udid, int size); } #endif #endif /* __cplusplus */ - -#endif \ No newline at end of file +#endif diff --git a/utils/include/dm_anonymous.h b/utils/include/dm_anonymous.h index a30909cf1..3537598b8 100644 --- a/utils/include/dm_anonymous.h +++ b/utils/include/dm_anonymous.h @@ -24,5 +24,4 @@ std::string GetAnonyString(const std::string &value); std::string GetAnonyInt32(const int32_t value); } // namespace DistributedHardware } // namespace OHOS - -#endif // OHOS_DM_ANONYMOUS_H \ No newline at end of file +#endif // OHOS_DM_ANONYMOUS_H diff --git a/utils/include/ipc/lite/ipc_cmd_register.h b/utils/include/ipc/lite/ipc_cmd_register.h index b4feac7f2..dd5967b0e 100644 --- a/utils/include/ipc/lite/ipc_cmd_register.h +++ b/utils/include/ipc/lite/ipc_cmd_register.h @@ -112,4 +112,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_IPC_CMD_PARSER_H \ No newline at end of file +#endif // OHOS_DM_IPC_CMD_PARSER_H diff --git a/utils/include/ipc/standard/ipc_cmd_register.h b/utils/include/ipc/standard/ipc_cmd_register.h index d83a9a517..fa4bd0e15 100644 --- a/utils/include/ipc/standard/ipc_cmd_register.h +++ b/utils/include/ipc/standard/ipc_cmd_register.h @@ -92,4 +92,4 @@ private: }; } // namespace DistributedHardware } // namespace OHOS -#endif // OHOS_DM_IPC_CMD_PARSER_H \ No newline at end of file +#endif // OHOS_DM_IPC_CMD_PARSER_H -- Gitee