From 47a85866550e3fee966a1d7cda5dbb7f60c02515 Mon Sep 17 00:00:00 2001 From: wangyb0625 Date: Mon, 14 Mar 2022 15:48:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=86=85=E6=BA=90=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=8D=95=E6=B8=85=E7=90=86-=E5=A2=9E=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E5=B0=BE=E9=83=A8=E5=92=8C=E4=BF=AE=E6=94=B9=E8=AE=B8?= =?UTF-8?q?=E5=8F=AF=E8=AF=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangyb0625 --- BUILD.gn | 2 +- OAT.xml | 2 +- common/include/dialog_ui/js/BUILD.gn | 2 +- common/include/dm_constants.h | 2 +- common/include/ipc/ipc_def.h | 2 +- .../ipc/model/ipc_authenticate_device_req.h | 2 +- .../include/ipc/model/ipc_get_dmfaparam_rsp.h | 2 +- .../ipc/model/ipc_get_info_by_network_req.h | 2 +- .../ipc/model/ipc_get_info_by_network_rsp.h | 2 +- .../ipc/model/ipc_get_local_device_info_rsp.h | 2 +- .../ipc/model/ipc_get_trustdevice_req.h | 2 +- .../ipc/model/ipc_get_trustdevice_rsp.h | 2 +- .../ipc/model/ipc_notify_auth_result_req.h | 2 +- .../ipc/model/ipc_notify_device_found_req.h | 2 +- .../ipc/model/ipc_notify_device_state_req.h | 2 +- .../model/ipc_notify_discover_result_req.h | 2 +- .../ipc/model/ipc_notify_dmfa_result_req.h | 2 +- .../model/ipc_notify_verify_auth_result_req.h | 2 +- .../ipc_register_dev_state_callback_req.h | 2 +- .../ipc/model/ipc_register_listener_req.h | 2 +- common/include/ipc/model/ipc_req.h | 2 +- common/include/ipc/model/ipc_rsp.h | 2 +- .../ipc/model/ipc_set_useroperation_req.h | 2 +- .../ipc/model/ipc_start_discovery_req.h | 2 +- .../ipc/model/ipc_stop_discovery_req.h | 2 +- .../ipc/model/ipc_unauthenticate_device_req.h | 2 +- .../ipc/model/ipc_verify_authenticate_req.h | 2 +- common/include/single_instance.h | 2 +- devicemanager.gni | 2 +- display/build.gradle | 2 +- display/entry/build.gradle | 2 +- display/entry/src/main/js/default/app.js | 2 +- .../src/main/js/default/pages/index/index.css | 2 +- .../src/main/js/default/pages/index/index.hml | 2 +- .../src/main/js/default/pages/index/index.js | 2 +- ext/BUILD.gn | 2 +- ext/input_pin_dialog/dialog_ui/js/BUILD.gn | 2 +- ext/mini/BUILD.gn | 2 +- ext/mini/common/include/constants.h | 4 +- .../common/include/device_manager_errno.h | 2 +- ext/mini/common/include/device_manager_log.h | 2 +- ext/mini/common/include/ipc/ipc_def.h | 2 +- .../ipc/model/ipc_authenticate_device_req.h | 2 +- .../ipc/model/ipc_check_authenticate_req.h | 2 +- .../model/ipc_get_authenticationparam_rsp.h | 2 +- .../ipc/model/ipc_get_trustdevice_req.h | 2 +- .../ipc/model/ipc_get_trustdevice_rsp.h | 2 +- .../ipc/model/ipc_notify_auth_result_req.h | 2 +- .../model/ipc_notify_check_auth_result_req.h | 2 +- .../ipc/model/ipc_notify_device_found_req.h | 2 +- .../ipc/model/ipc_notify_device_state_req.h | 2 +- .../model/ipc_notify_discover_result_req.h | 2 +- .../ipc/model/ipc_notify_dmfa_result_req.h | 2 +- .../ipc/model/ipc_register_listener_req.h | 2 +- ext/mini/common/include/ipc/model/ipc_req.h | 2 +- ext/mini/common/include/ipc/model/ipc_rsp.h | 2 +- .../ipc/model/ipc_set_useroperation_req.h | 2 +- .../ipc/model/ipc_start_discovery_req.h | 2 +- .../ipc/model/ipc_stop_discovery_req.h | 2 +- ext/mini/common/include/single_instance.h | 2 +- ext/mini/devicemanager.gni | 2 +- .../inner_kits/native_cpp/BUILD.gn | 2 +- .../native_cpp/include/device_manager.h | 2 +- .../include/device_manager_callback.h | 2 +- .../native_cpp/include/device_manager_impl.h | 2 +- .../native_cpp/include/dm_app_image_info.h | 2 +- .../native_cpp/include/dm_device_info.h | 2 +- .../native_cpp/include/dm_subscribe_info.h | 2 +- .../include/notify/device_manager_notify.h | 2 +- .../native_cpp/src/device_manager.cpp | 2 +- .../native_cpp/src/device_manager_impl.cpp | 86 +++++----- .../src/notify/device_manager_notify.cpp | 44 ++--- ext/mini/interfaces_mini/kits/js/BUILD.gn | 2 +- .../kits/js/include/dm_native_event.h | 2 +- .../kits/js/include/native_devicemanager_js.h | 2 +- .../kits/js/src/dm_native_event.cpp | 24 +-- .../kits/js/src/native_devicemanager_js.cpp | 160 +++++++++--------- ext/mini/sa_profile/4802.xml | 2 +- ext/mini/sa_profile/BUILD.gn | 2 +- .../services/devicemanagerservice/BUILD.gn | 2 +- .../include/ability/dm_ability_manager.h | 2 +- .../include/auth/hichain_connector.h | 2 +- .../dispatch/authenticate_device_req.h | 2 +- .../include/dispatch/check_authenticate_req.h | 2 +- .../dispatch/get_authenticationparam_rsp.h | 2 +- .../include/dispatch/get_trustdevice_req.h | 2 +- .../include/dispatch/get_trustdevice_rsp.h | 2 +- .../include/dispatch/message_def.h | 2 +- .../include/dispatch/message_processing.h | 2 +- .../include/dispatch/message_req.h | 2 +- .../include/dispatch/message_rsp.h | 2 +- .../include/dispatch/server_init.h | 2 +- .../include/dispatch/server_stub.h | 2 +- .../include/dispatch/set_useroperation_req.h | 2 +- .../include/dispatch/start_discovery_req.h | 2 +- .../include/dispatch/stop_discovery_req.h | 2 +- .../include/message/msg_codec.h | 2 +- .../include/message/msg_head.h | 2 +- .../include/message/msg_request_auth.h | 2 +- .../include/message/msg_response_auth.h | 2 +- .../include/message/msg_sync_group.h | 2 +- .../include/requestauth/auth_manager.h | 2 +- .../include/requestauth/request_session.h | 2 +- .../include/requestauth/response_session.h | 2 +- .../include/softbus/softbus_adapter.h | 2 +- .../include/softbus/softbus_session.h | 2 +- .../include/timer/dm_timer.h | 2 +- .../src/ability/lite/dm_ability_manager.cpp | 2 +- .../ability/standard/dm_ability_manager.cpp | 10 +- .../src/auth/hichain_connector.cpp | 68 ++++---- .../src/dispatch/command_dispatch.cpp | 12 +- .../src/dispatch/message_processing.cpp | 43 +++-- .../src/dispatch/server_init.cpp | 8 +- .../src/dispatch/server_stub.cpp | 12 +- .../src/message/msg_codec.cpp | 12 +- .../src/message/msg_head.cpp | 6 +- .../src/message/msg_request_auth.cpp | 68 ++++---- .../src/message/msg_response_auth.cpp | 38 ++--- .../src/message/msg_sync_group.cpp | 12 +- .../multipleuser/multiple_user_connector.cpp | 2 +- .../src/requestauth/auth_manager.cpp | 72 ++++---- .../src/requestauth/request_session.cpp | 44 ++--- .../src/requestauth/response_session.cpp | 54 +++--- .../src/softbus/softbus_adapter.cpp | 92 +++++----- .../src/softbus/softbus_session.cpp | 52 +++--- .../src/timer/dm_timer.cpp | 22 +-- ext/mini/test/BUILD.gn | 2 +- ext/mini/test/unittest/BUILD.gn | 2 +- .../unittest/device_manager_impl_test.cpp | 2 +- .../test/unittest/device_manager_impl_test.h | 2 +- .../unittest/mock/mock_ipc_client_proxy.h | 2 +- ext/mini/utils/BUILD.gn | 2 +- ext/mini/utils/include/anonymous_string.h | 2 +- ext/mini/utils/include/cipher/encrypt_utils.h | 2 +- .../utils/include/ipc/lite/ipc_cmd_register.h | 2 +- .../include/ipc/standard/ipc_cmd_register.h | 2 +- ext/mini/utils/include/log/dm_log.h | 2 +- ext/mini/utils/src/anonymous_string.cpp | 2 +- ext/mini/utils/src/cipher/encrypt_utils.cpp | 2 +- .../utils/src/ipc/lite/ipc_cmd_register.cpp | 10 +- .../src/ipc/standard/ipc_cmd_register.cpp | 8 +- ext/mini/utils/src/log/dm_log.cpp | 2 +- ext/no_interaction_auth/BUILD.gn | 2 +- .../include/ability/dm_ability_manager.h | 2 +- .../include/no_interaction_auth.h | 2 +- .../src/ability/lite/dm_ability_manager.cpp | 2 +- .../ability/standard/dm_ability_manager.cpp | 2 +- .../src/no_interaction_auth.cpp | 2 +- ext/pin_auth/BUILD.gn | 2 +- .../include/ability/dm_ability_manager.h | 2 +- ext/pin_auth/include/pin_auth.h | 2 +- ext/pin_auth/include/pin_auth_ui.h | 2 +- .../src/ability/lite/dm_ability_manager.cpp | 2 +- .../ability/standard/dm_ability_manager.cpp | 2 +- ext/pin_auth/src/pin_auth.cpp | 2 +- ext/pin_auth/src/pin_auth_ui.cpp | 2 +- ext/profile/BUILD.gn | 2 +- ext/profile/include/device_profile_adapter.h | 2 +- ext/profile/include/profile_connector.h | 2 +- .../include/profile_connector_callback.h | 2 +- ext/profile/src/device_profile_adapter.cpp | 2 +- ext/profile/src/profile_connector.cpp | 2 +- ext/show_pin_dialog/dialog_ui/js/BUILD.gn | 2 +- interfaces/inner_kits/native_cpp/BUILD.gn | 2 +- .../native_cpp/include/device_manager.h | 2 +- .../include/device_manager_callback.h | 2 +- .../native_cpp/include/device_manager_impl.h | 2 +- .../native_cpp/include/dm_app_image_info.h | 2 +- .../native_cpp/include/dm_device_info.h | 2 +- .../native_cpp/include/dm_subscribe_info.h | 2 +- .../native_cpp/include/ipc/ipc_client.h | 2 +- .../native_cpp/include/ipc/ipc_client_proxy.h | 2 +- .../include/ipc/lite/ipc_client_manager.h | 2 +- .../ipc/lite/ipc_client_server_proxy.h | 2 +- .../include/ipc/lite/ipc_client_stub.h | 2 +- .../include/ipc/standard/ipc_client_manager.h | 2 +- .../ipc/standard/ipc_client_server_proxy.h | 2 +- .../include/ipc/standard/ipc_client_stub.h | 2 +- .../include/ipc/standard/ipc_remote_broker.h | 2 +- .../include/notify/device_manager_notify.h | 2 +- .../native_cpp/src/device_manager.cpp | 2 +- .../native_cpp/src/device_manager_impl.cpp | 2 +- .../native_cpp/src/ipc/ipc_client_proxy.cpp | 2 +- .../src/ipc/lite/ipc_client_manager.cpp | 2 +- .../src/ipc/lite/ipc_client_server_proxy.cpp | 2 +- .../src/ipc/lite/ipc_client_stub.cpp | 2 +- .../src/ipc/lite/ipc_cmd_parser.cpp | 2 +- .../src/ipc/standard/ipc_client_manager.cpp | 2 +- .../ipc/standard/ipc_client_server_proxy.cpp | 2 +- .../src/ipc/standard/ipc_client_stub.cpp | 2 +- .../src/ipc/standard/ipc_cmd_parser.cpp | 2 +- .../src/notify/device_manager_notify.cpp | 2 +- interfaces/kits/BUILD.gn | 2 +- interfaces/kits/js/BUILD.gn | 2 +- interfaces/kits/js/include/dm_native_event.h | 2 +- .../kits/js/include/native_devicemanager_js.h | 2 +- interfaces/kits/js/src/dm_native_event.cpp | 2 +- .../kits/js/src/native_devicemanager_js.cpp | 2 +- sa_profile/4802.xml | 2 +- sa_profile/BUILD.gn | 2 +- services/devicemanagerservice/BUILD.gn | 2 +- .../include/ability/dm_ability_manager.h | 2 +- .../include/adapter/crypto_adapter.h | 2 +- .../include/adapter/decision_adapter.h | 2 +- .../include/adapter/dm_adapter_manager.h | 2 +- .../include/adapter/profile_adapter.h | 2 +- .../authentication/auth_message_processor.h | 2 +- .../authentication/auth_request_state.h | 2 +- .../authentication/auth_response_state.h | 2 +- .../include/authentication/auth_ui.h | 2 +- .../include/authentication/authentication.h | 2 +- .../include/authentication/dm_auth_manager.h | 2 +- .../include/config/dm_config_manager.h | 2 +- .../include/config/json_config.h | 2 +- .../commonevent/dm_common_event_manager.h | 2 +- .../dependency/hichain/hichain_connector.h | 2 +- .../hichain/hichain_connector_callback.h | 2 +- .../multipleuser/multiple_user_connector.h | 2 +- .../dependency/softbus/softbus_connector.h | 2 +- .../softbus/softbus_discovery_callback.h | 2 +- .../dependency/softbus/softbus_session.h | 2 +- .../softbus/softbus_session_callback.h | 2 +- .../softbus/softbus_state_callback.h | 2 +- .../include/dependency/timer/dm_timer.h | 2 +- .../include/device_manager_service.h | 2 +- .../include/device_manager_service_listener.h | 2 +- .../deviceinfo/dm_device_info_manager.h | 2 +- .../devicestate/dm_device_state_manager.h | 2 +- .../include/discovery/dm_discovery_manager.h | 2 +- .../include/ipc/lite/ipc_server_listener.h | 2 +- .../include/ipc/lite/ipc_server_listenermgr.h | 2 +- .../include/ipc/lite/ipc_server_stub.h | 2 +- .../ipc/standard/ipc_server_client_proxy.h | 2 +- .../ipc/standard/ipc_server_listener.h | 2 +- .../include/ipc/standard/ipc_server_stub.h | 2 +- .../src/ability/lite/dm_ability_manager.cpp | 2 +- .../ability/standard/dm_ability_manager.cpp | 4 +- .../src/adapter/lite/dm_adapter_manager.cpp | 2 +- .../adapter/standard/dm_adapter_manager.cpp | 2 +- .../authentication/auth_message_processor.cpp | 2 +- .../src/authentication/auth_request_state.cpp | 2 +- .../authentication/auth_response_state.cpp | 2 +- .../src/authentication/auth_ui.cpp | 2 +- .../src/authentication/dm_auth_manager.cpp | 2 +- .../src/config/dm_config_manager.cpp | 2 +- .../commonevent/dm_common_event_manager.cpp | 2 +- .../dependency/hichain/hichain_connector.cpp | 2 +- .../multipleuser/multiple_user_connector.cpp | 2 +- .../dependency/softbus/softbus_connector.cpp | 2 +- .../dependency/softbus/softbus_session.cpp | 2 +- .../src/dependency/timer/dm_timer.cpp | 2 +- .../src/device_manager_service.cpp | 2 +- .../src/device_manager_service_listener.cpp | 2 +- .../src/deviceinfo/dm_device_info_manager.cpp | 2 +- .../devicestate/dm_device_state_manager.cpp | 2 +- .../src/discovery/dm_discovery_manager.cpp | 2 +- .../src/ipc/lite/ipc_cmd_parser.cpp | 2 +- .../src/ipc/lite/ipc_server_listener.cpp | 2 +- .../src/ipc/lite/ipc_server_listenermgr.cpp | 2 +- .../src/ipc/lite/ipc_server_main.cpp | 2 +- .../src/ipc/lite/ipc_server_stub.cpp | 2 +- .../src/ipc/standard/ipc_cmd_parser.cpp | 2 +- .../ipc/standard/ipc_server_client_proxy.cpp | 2 +- .../src/ipc/standard/ipc_server_listener.cpp | 2 +- .../src/ipc/standard/ipc_server_stub.cpp | 2 +- test/BUILD.gn | 2 +- test/unittest/BUILD.gn | 2 +- .../UTTest_auth_message_processor.cpp | 2 +- test/unittest/UTTest_auth_message_processor.h | 2 +- test/unittest/UTTest_auth_request_state.cpp | 2 +- test/unittest/UTTest_auth_request_state.h | 2 +- test/unittest/UTTest_auth_response_state.cpp | 2 +- test/unittest/UTTest_auth_response_state.h | 2 +- .../UTTest_device_manager_service.cpp | 2 +- test/unittest/UTTest_device_manager_service.h | 2 +- ...UTTest_device_manager_service_listener.cpp | 2 +- .../UTTest_device_manager_service_listener.h | 2 +- test/unittest/UTTest_dm_auth_manager.cpp | 2 +- test/unittest/UTTest_dm_auth_manager.h | 2 +- .../UTTest_dm_device_info_manager.cpp | 2 +- test/unittest/UTTest_dm_device_info_manager.h | 2 +- .../UTTest_dm_device_state_manager.cpp | 2 +- .../unittest/UTTest_dm_device_state_manager.h | 2 +- test/unittest/UTTest_dm_discovery_manager.cpp | 2 +- test/unittest/UTTest_dm_discovery_manager.h | 2 +- test/unittest/UTTest_ipc_client_manager.cpp | 2 +- test/unittest/UTTest_ipc_client_manager.h | 2 +- test/unittest/UTTest_ipc_client_proxy.cpp | 2 +- test/unittest/UTTest_ipc_client_proxy.h | 2 +- test/unittest/UTTest_ipc_client_stub.cpp | 2 +- test/unittest/UTTest_ipc_client_stub.h | 2 +- .../UTTest_ipc_server_client_proxy.cpp | 2 +- .../unittest/UTTest_ipc_server_client_proxy.h | 2 +- test/unittest/UTTest_ipc_server_listener.cpp | 2 +- test/unittest/UTTest_ipc_server_listener.h | 2 +- test/unittest/UTTest_ipc_server_stub.cpp | 2 +- test/unittest/UTTest_ipc_server_stub.h | 2 +- test/unittest/UTTest_softbus_connector.cpp | 2 +- test/unittest/UTTest_softbus_connector.h | 2 +- test/unittest/UTTest_softbus_session.cpp | 2 +- test/unittest/UTTest_softbus_session.h | 2 +- test/unittest/auth_request_state.cpp | 2 +- test/unittest/auth_response_state.cpp | 2 +- test/unittest/device_manager_impl_test.cpp | 2 +- test/unittest/device_manager_impl_test.h | 2 +- test/unittest/mock/device_auth.cpp | 2 +- test/unittest/mock/device_auth.h | 2 +- test/unittest/mock/ipc_server_listener.cpp | 2 +- test/unittest/mock/ipc_server_listener.h | 2 +- test/unittest/mock/mock_ipc_client.h | 2 +- test/unittest/mock/mock_ipc_client_manager.h | 2 +- test/unittest/mock/mock_ipc_client_proxy.h | 2 +- test/unittest/mock/parameter.cpp | 2 +- test/unittest/mock/parameter.h | 2 +- test/unittest/mock/session.h | 2 +- test/unittest/mock/softbus_bus_center.cpp | 2 +- utils/BUILD.gn | 2 +- utils/include/dm_anonymous.h | 2 +- utils/include/dm_hash.h | 2 +- utils/include/dm_log.h | 2 +- utils/include/dm_random.h | 2 +- utils/include/ipc/lite/ipc_cmd_register.h | 2 +- utils/include/ipc/standard/ipc_cmd_register.h | 2 +- utils/src/dm_anonymous.cpp | 2 +- utils/src/dm_hash.cpp | 2 +- utils/src/dm_log.cpp | 2 +- utils/src/dm_random.cpp | 2 +- utils/src/ipc/lite/ipc_cmd_register.cpp | 2 +- utils/src/ipc/standard/ipc_cmd_register.cpp | 2 +- 329 files changed, 785 insertions(+), 788 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 7e5dfc76c..87f37ccd6 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# Copyright (C) 2022 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 diff --git a/OAT.xml b/OAT.xml index 02e212b1f..54fc1b978 100644 --- a/OAT.xml +++ b/OAT.xml @@ -1,5 +1,5 @@ -