From 48405a886b8ef33a7fd6a415c36bafee5eea0c4e Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Thu, 9 Jan 2025 14:34:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=85=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=80?= =?UTF-8?q?=E6=AC=A1hichain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gaoqiang_strong --- .../src/dependency/hichain/hichain_auth_connector.cpp | 6 +----- .../src/dependency/hichain/hichain_connector.cpp | 1 - services/service/src/device_manager_service.cpp | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp index 4bce015e4..d29701ccd 100644 --- a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp @@ -27,10 +27,6 @@ std::mutex HiChainAuthConnector::dmDeviceAuthCallbackMutex_; HiChainAuthConnector::HiChainAuthConnector() { - int32_t ret = InitDeviceAuthService(); - if (ret != HC_SUCCESS) { - LOGE("hichain InitDeviceAuthService failed, err %{public}d.", ret); - } deviceAuthCallback_ = {.onTransmit = HiChainAuthConnector::onTransmit, .onSessionKeyReturned = HiChainAuthConnector::onSessionKeyReturned, .onFinish = HiChainAuthConnector::onFinish, @@ -41,7 +37,7 @@ HiChainAuthConnector::HiChainAuthConnector() HiChainAuthConnector::~HiChainAuthConnector() { - DestroyDeviceAuthService(); + LOGI("HiChainAuthConnector::destructor."); } int32_t HiChainAuthConnector::RegisterHiChainAuthCallback(std::shared_ptr callback) diff --git a/services/implementation/src/dependency/hichain/hichain_connector.cpp b/services/implementation/src/dependency/hichain/hichain_connector.cpp index 14adb571c..a407dda31 100644 --- a/services/implementation/src/dependency/hichain/hichain_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_connector.cpp @@ -96,7 +96,6 @@ HiChainConnector::HiChainConnector() .onFinish = HiChainConnector::onFinish, .onError = HiChainConnector::onError, .onRequest = HiChainConnector::onRequest}; - InitDeviceAuthService(); deviceGroupManager_ = GetGmInstance(); if (deviceGroupManager_ == nullptr) { LOGE("[HICHAIN]failed to init group manager."); diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 9e5e93df1..dd8aa34e9 100755 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -89,6 +89,7 @@ DeviceManagerService::~DeviceManagerService() UnloadDMServiceImplSo(); UnloadDMServiceAdapter(); UnloadDMServiceAdapterResident(); + DestroyDeviceAuthService(); } int32_t DeviceManagerService::Init() -- Gitee