From 82368b1aa6e74fa1e0237c278f34ab6c83bb6b88 Mon Sep 17 00:00:00 2001 From: tangfan Date: Wed, 10 Aug 2022 16:44:35 +0800 Subject: [PATCH] fix isDHFWKOnLine status Signed-off-by: tangfan --- .../inner_kits/src/distributed_hardware_fwk_kit.cpp | 8 ++++---- interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp | 5 ----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp b/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp index f42d9f39..18038a0e 100644 --- a/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp +++ b/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp @@ -47,7 +47,7 @@ int32_t DistributedHardwareFwkKit::RegisterPublisherListener(const DHTopic topic } int32_t ret = DH_FWK_SUCCESS; - if (isDHFWKOnLine_ && DHFWKSAManager::GetInstance().GetDHFWKProxy() != nullptr) { + if (DHFWKSAManager::GetInstance().GetDHFWKProxy() != nullptr) { ret = DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterPublisherListener(topic, listener); DHLOGI("Register publisher listener to DHFWK, ret: %" PRId32, ret); } else { @@ -69,7 +69,7 @@ int32_t DistributedHardwareFwkKit::UnregisterPublisherListener(const DHTopic top } int32_t ret = DH_FWK_SUCCESS; - if (isDHFWKOnLine_ && DHFWKSAManager::GetInstance().GetDHFWKProxy() != nullptr) { + if (DHFWKSAManager::GetInstance().GetDHFWKProxy() != nullptr) { ret = DHFWKSAManager::GetInstance().GetDHFWKProxy()->UnregisterPublisherListener(topic, listener); DHLOGI("Unregister publisher listener to DHFWK, ret: %" PRId32, ret); } @@ -87,7 +87,7 @@ int32_t DistributedHardwareFwkKit::PublishMessage(const DHTopic topic, const std return ERR_DH_FWK_PARA_INVALID; } - if (!isDHFWKOnLine_ || DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) { + if (DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) { DHLOGI("DHFWK not online, can not publish message"); return ERR_DH_FWK_PUBLISH_MSG_FAILED; } @@ -108,7 +108,7 @@ void DistributedHardwareFwkKit::OnDHFWKOnLine(bool isOnLine) DHLOGI("Receive DHFWK online callback, %s", (isOnLine ? "true" : "false")); isDHFWKOnLine_ = isOnLine; - if (!isDHFWKOnLine_ || DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) { + if (DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) { return; } diff --git a/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp b/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp index aa5082b3..556d566f 100644 --- a/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp +++ b/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp @@ -67,11 +67,6 @@ sptr DHFWKSAManager::GetDHFWKProxy() RegisterAbilityListener(); } - if (!dhfwkOnLine_) { - DHLOGW("DHFWK not online, return"); - return nullptr; - } - std::lock_guard lock(proxyMutex_); if (dhfwkProxy_ == nullptr) { sptr saMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); -- Gitee