diff --git a/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp b/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp index f42d9f39a7ec006bbf39b5a11b81e2d9b140a236..18038a0ee250f903d1ff9688d167f280b7dbf04c 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 aa5082b3fc8e0be092ff7c2260f75f45f75375cc..556d566f96b2afb7240d0e9ad93fb688157931ec 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();