From ba7859e4affbaf9f648a0777d926b7a5567fea8f Mon Sep 17 00:00:00 2001 From: txl Date: Wed, 17 Jan 2024 12:48:10 +0800 Subject: [PATCH 1/9] googletest_1.13.0 Signed-off-by: txl --- utils/test/unittest/common/eventbus/event_bus_test.cpp | 1 - utils/test/unittest/common/eventbus/event_bus_test.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test/unittest/common/eventbus/event_bus_test.cpp b/utils/test/unittest/common/eventbus/event_bus_test.cpp index 400eafef..78b2b81c 100644 --- a/utils/test/unittest/common/eventbus/event_bus_test.cpp +++ b/utils/test/unittest/common/eventbus/event_bus_test.cpp @@ -15,7 +15,6 @@ #include "event_bus_test.h" -#include #include #include #include diff --git a/utils/test/unittest/common/eventbus/event_bus_test.h b/utils/test/unittest/common/eventbus/event_bus_test.h index 3d953e75..e3be69e1 100644 --- a/utils/test/unittest/common/eventbus/event_bus_test.h +++ b/utils/test/unittest/common/eventbus/event_bus_test.h @@ -17,6 +17,7 @@ #define OHOS_DISTRIBUTED_HARDWARE_EVENT_BUS_TEST_H #include +#include #include #include -- Gitee From a915c42fc775072ce04bee30265e41ca9a49af31 Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Fri, 26 Jan 2024 08:51:03 +0000 Subject: [PATCH 2/9] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!489?= =?UTF-8?q?=20:=20distributedhardware=5Fdistributed=5Fhardware=5Ffwk?= =?UTF-8?q?=E4=BB=93=E9=80=82=E9=85=8Dgoogletest1.13.0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/test/unittest/common/eventbus/event_bus_test.cpp | 1 + utils/test/unittest/common/eventbus/event_bus_test.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test/unittest/common/eventbus/event_bus_test.cpp b/utils/test/unittest/common/eventbus/event_bus_test.cpp index 78b2b81c..400eafef 100644 --- a/utils/test/unittest/common/eventbus/event_bus_test.cpp +++ b/utils/test/unittest/common/eventbus/event_bus_test.cpp @@ -15,6 +15,7 @@ #include "event_bus_test.h" +#include #include #include #include diff --git a/utils/test/unittest/common/eventbus/event_bus_test.h b/utils/test/unittest/common/eventbus/event_bus_test.h index e3be69e1..3d953e75 100644 --- a/utils/test/unittest/common/eventbus/event_bus_test.h +++ b/utils/test/unittest/common/eventbus/event_bus_test.h @@ -17,7 +17,6 @@ #define OHOS_DISTRIBUTED_HARDWARE_EVENT_BUS_TEST_H #include -#include #include #include -- Gitee From e29b1321e6f1ab6d6649da409825ec64f449aa36 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Sat, 27 Jan 2024 19:01:37 +0800 Subject: [PATCH 3/9] modify hot plugin trigger system awake problem Signed-off-by: hwzhangchuang --- bundle.json | 3 +- .../distributedhardwarefwkservice/BUILD.gn | 1 + .../include/utils/dh_context.h | 20 ++++++++- .../plugin_listener_impl.cpp | 8 ++++ .../src/utils/dh_context.cpp | 41 +++++++++++++++++++ 5 files changed, 70 insertions(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index 2bcebbe9..034171df 100644 --- a/bundle.json +++ b/bundle.json @@ -50,7 +50,8 @@ "graphic_2d", "graphic_surface", "media_foundation", - "bounds_checking_function" + "bounds_checking_function", + "power_manager" ], "third_party": [ "json", diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index 117a506a..8074d244 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -130,6 +130,7 @@ ohos_shared_library("distributedhardwarefwksvr") { "init:libbegetutil", "ipc:ipc_core", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", "resource_schedule_service:ressched_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/distributedhardwarefwkservice/include/utils/dh_context.h b/services/distributedhardwarefwkservice/include/utils/dh_context.h index a62afa03..c7869ea0 100644 --- a/services/distributedhardwarefwkservice/include/utils/dh_context.h +++ b/services/distributedhardwarefwkservice/include/utils/dh_context.h @@ -16,11 +16,15 @@ #ifndef OHOS_DISTRIBUTED_HARDWARE_DHCONTEXT_H #define OHOS_DISTRIBUTED_HARDWARE_DHCONTEXT_H +#include #include #include #include #include +#include "power_mgr_client.h" +#include "power_state_callback_stub.h" + #include "device_type.h" #include "event_handler.h" #include "single_instance.h" @@ -55,18 +59,30 @@ public: }; std::shared_ptr GetEventHandler(); + bool IsSleeping(); + void SetIsSleeping(bool isSleeping); + +private: + class DHFWKPowerStateCallback : public OHOS::PowerMgr::PowerStateCallbackStub { + public: + void OnPowerStateChanged(OHOS::PowerMgr::PowerState state) override; + }; + void RegisterPowerStateLinstener(); + private: DeviceInfo devInfo_ { "", "", "", 0 }; std::mutex devMutex_; /* Save online device uuid and networkId */ - std::unordered_map onlineDeviceMap_; + std::unordered_map onlineDeviceMap_ = {}; /* Save online device hashed uuid and uuid */ - std::unordered_map deviceIdUUIDMap_; + std::unordered_map deviceIdUUIDMap_ = {}; std::shared_mutex onlineDevMutex_; std::shared_ptr eventHandler_; + /* true for system in sleeping, false for NOT in sleeping */ + std::atomic isSleeping_ = false; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp index fe50486f..5424af28 100644 --- a/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp +++ b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp @@ -36,6 +36,10 @@ void PluginListenerImpl::PluginHardware(const std::string &dhId, const std::stri return; } DHLOGI("plugin start, dhId: %s", GetAnonyString(dhId).c_str()); + if (DHContext::GetInstance().IsSleeping()) { + DHLOGI("System is in sleeping, drop it"); + return; + } std::vector> capabilityInfos; std::string deviceId = DHContext::GetInstance().GetDeviceInfo().deviceId; std::string devName = DHContext::GetInstance().GetDeviceInfo().deviceName; @@ -56,6 +60,10 @@ void PluginListenerImpl::UnPluginHardware(const std::string &dhId) return; } DHLOGI("unplugin start, dhId: %s", GetAnonyString(dhId).c_str()); + if (DHContext::GetInstance().IsSleeping()) { + DHLOGI("System is in sleeping, drop it"); + return; + } std::string deviceId = DHContext::GetInstance().GetDeviceInfo().deviceId; std::shared_ptr capability = nullptr; auto ret = CapabilityInfoManager::GetInstance()->GetCapability(deviceId, dhId, capability); diff --git a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp index 57c066c9..0deec491 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp @@ -30,6 +30,7 @@ DHContext::DHContext() DHLOGI("Ctor DHContext"); std::shared_ptr runner = AppExecFwk::EventRunner::Create(true); eventHandler_ = std::make_shared(runner); + RegisterPowerStateLinstener(); } DHContext::~DHContext() @@ -37,6 +38,46 @@ DHContext::~DHContext() DHLOGI("Dtor DHContext"); } +void DHContext::RegisterPowerStateLinstener() +{ + sptr powerStateCallback_(new DHFWKPowerStateCallback()); + if (powerStateCallback_ == nullptr) { + DHLOGE("DHFWK subscribe create power state callback Create Error"); + return; + } + + bool ret = PowerMgr::PowerMgrClient::GetInstance().RegisterPowerStateCallback(powerStateCallback_); + if (!ret) { + DHLOGE("DHFWK register power state callback failed"); + } else { + DHLOGE("DHFWK register power state callback success"); + } +} + +void DHContext::DHFWKPowerStateCallback::OnPowerStateChanged(PowerMgr::PowerState state) +{ + DHLOGI("DHFWK OnPowerStateChanged state: %u", static_cast(state)); + if (state == PowerMgr::PowerState::SLEEP || state == PowerMgr::PowerState::HIBERNATE || + state == PowerMgr::PowerState::SHUTDOWN) { + DHLOGI("DHFWK set in sleeping"); + DHContext::GetInstance().SetIsSleeping(true); + return; + } + + DHLOGI("DHFWK set NOT in sleeping"); + DHContext::GetInstance().SetIsSleeping(false); +} + +bool DHContext::IsSleeping() +{ + return isSleeping_; +} + +void DHContext::SetIsSleeping(bool isSleeping) +{ + isSleeping_ = isSleeping; +} + DHContext::CommonEventHandler::CommonEventHandler(const std::shared_ptr &runner) : AppExecFwk::EventHandler(runner) { -- Gitee From 5cf3ea14ad02dcca648697f285021f3c15748a69 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Sat, 27 Jan 2024 21:36:21 +0800 Subject: [PATCH 4/9] modify Signed-off-by: hwzhangchuang --- .../test/unittest/common/accessmanager/BUILD.gn | 1 + .../test/unittest/common/componentloader/BUILD.gn | 1 + .../unittest/common/componentmanager/component_manager/BUILD.gn | 1 + .../test/unittest/common/dbadapter/BUILD.gn | 1 + .../test/unittest/common/distributedhardwaremanager/BUILD.gn | 1 + .../test/unittest/common/distributedhardwareservice/BUILD.gn | 1 + .../common/localhardwaremanager/localhardwaremanager/BUILD.gn | 1 + .../test/unittest/common/resourcemanager/BUILD.gn | 1 + .../test/unittest/common/versioninfomanager/versioninfo/BUILD.gn | 1 + .../common/versioninfomanager/versioninfomanager/BUILD.gn | 1 + utils/test/unittest/common/eventtrance/BUILD.gn | 1 + 11 files changed, 11 insertions(+) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index 490c99d5..dcbc89f5 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -61,6 +61,7 @@ ohos_unittest("AccessManagerTest") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", + "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn index 35a03a68..193efc05 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn @@ -54,6 +54,7 @@ ohos_unittest("ComponentLoaderTest") { "config_policy:configpolicy_util", "hitrace:hitrace_meter", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", ] defines = [ diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn index afc1fb71..25f16a77 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn @@ -67,6 +67,7 @@ ohos_unittest("ComponentManagerTest") { "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_single", + "power_manager:powermgr_client", "kv_store:distributeddata_inner", ] diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn index 2e404e16..370032e4 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn @@ -61,6 +61,7 @@ ohos_unittest("DbAdapterTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", "safwk:system_ability_fwk", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn index caa0a7b9..9017a515 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -49,6 +49,7 @@ ohos_unittest("DistributedHardwareManagerTest") { external_deps = [ "c_utils:utils", "eventhandler:libeventhandler", + "power_manager:powermgr_client", ] defines = [ diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn index 432b0905..b1ffab8b 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn @@ -58,6 +58,7 @@ ohos_unittest("DistributedHardwareServiceTest") { "c_utils:utils", "eventhandler:libeventhandler", "ipc:ipc_core", + "power_manager:powermgr_client", "safwk:system_ability_fwk", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn index aa5f9773..7905c5e8 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn @@ -57,6 +57,7 @@ ohos_unittest("LocalHardwareManagerTest") { "eventhandler:libeventhandler", "hisysevent:libhisysevent", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", ] defines = [ diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 18d2e280..15157c63 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -51,6 +51,7 @@ ohos_unittest("ResourceManagerTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", "safwk:system_ability_fwk", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn index e4b51703..ac50f7da 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn @@ -51,6 +51,7 @@ ohos_unittest("VersionInfoTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", "safwk:system_ability_fwk", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn index 38a9c45d..d9cfa77b 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn @@ -52,6 +52,7 @@ ohos_unittest("VersioninfoManagerTest") { "c_utils:utils", "eventhandler:libeventhandler", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", "safwk:system_ability_fwk", ] } diff --git a/utils/test/unittest/common/eventtrance/BUILD.gn b/utils/test/unittest/common/eventtrance/BUILD.gn index 4ff0134b..e240e684 100644 --- a/utils/test/unittest/common/eventtrance/BUILD.gn +++ b/utils/test/unittest/common/eventtrance/BUILD.gn @@ -51,6 +51,7 @@ ohos_unittest("EventTranceTest") { "c_utils:utils", "hisysevent:libhisysevent", "hitrace:hitrace_meter", + "power_manager:powermgr_client", "safwk:system_ability_fwk", ] } -- Gitee From 0af67a45b97b418a3eede2fd5e39c26248daed29 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Sat, 27 Jan 2024 22:34:38 +0800 Subject: [PATCH 5/9] modify Signed-off-by: hwzhangchuang --- .../test/fuzztest/resourcemanager_fuzzer/BUILD.gn | 1 + .../unittest/common/componentmanager/component_manager/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 9acd72e5..1032e672 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -56,6 +56,7 @@ ohos_fuzztest("ResourcemanagerFuzzTest") { "eventhandler:libeventhandler", "ipc:ipc_single", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn index 25f16a77..5c83232c 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn @@ -67,8 +67,8 @@ ohos_unittest("ComponentManagerTest") { "dsoftbus:softbus_client", "eventhandler:libeventhandler", "ipc:ipc_single", - "power_manager:powermgr_client", "kv_store:distributeddata_inner", + "power_manager:powermgr_client", ] defines = [ -- Gitee From 3a2f1bd055b128fdcf9f6f1fe1ce75a0af129a05 Mon Sep 17 00:00:00 2001 From: s30051537 Date: Thu, 25 Jan 2024 17:42:20 +0800 Subject: [PATCH 6/9] =?UTF-8?q?SA=E5=B4=A9=E6=BA=83=E5=90=8E=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E4=B8=9A=E5=8A=A1=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: s30051537 --- .../include/distributed_hardware_fwk_kit.h | 2 - .../inner_kits/include/ipc/dhfwk_sa_manager.h | 10 ++++ .../src/distributed_hardware_fwk_kit.cpp | 51 +++++++------------ .../inner_kits/src/ipc/dhfwk_sa_manager.cpp | 40 +++++++++++++++ 4 files changed, 69 insertions(+), 34 deletions(-) diff --git a/interfaces/inner_kits/include/distributed_hardware_fwk_kit.h b/interfaces/inner_kits/include/distributed_hardware_fwk_kit.h index 1e22a572..e4d34565 100644 --- a/interfaces/inner_kits/include/distributed_hardware_fwk_kit.h +++ b/interfaces/inner_kits/include/distributed_hardware_fwk_kit.h @@ -173,8 +173,6 @@ private: bool IsQueryLocalSysSpecTypeValid(QueryLocalSysSpecType spec); private: - std::mutex listenerMutex_; - std::unordered_map>> listenerMap_; std::atomic isDHFWKOnLine_; }; } // namespace DistributedHardware diff --git a/interfaces/inner_kits/include/ipc/dhfwk_sa_manager.h b/interfaces/inner_kits/include/ipc/dhfwk_sa_manager.h index ef35c38a..9dce2eaa 100644 --- a/interfaces/inner_kits/include/ipc/dhfwk_sa_manager.h +++ b/interfaces/inner_kits/include/ipc/dhfwk_sa_manager.h @@ -19,6 +19,7 @@ #include #include #include +#include #include "refbase.h" #include "system_ability_status_change_stub.h" @@ -46,6 +47,15 @@ public: void OnRemoveSystemAbility(int32_t systemAbilityId, const std::string &deviceId) override; }; +private: + static int32_t RestoreListener(); + +public: + static std::mutex publisherListenersMutex_; + static std::unordered_map>> publisherListenersCahce_; + static std::mutex avTransControlCenterCbMutex_; + static std::unordered_map> avTransControlCenterCbCache_; + private: std::atomic dhfwkOnLine_; std::atomic isSubscribeDHFWKSAChangeListener; diff --git a/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp b/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp index 97ea5d58..8f9d0d11 100644 --- a/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp +++ b/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp @@ -26,7 +26,8 @@ namespace OHOS { namespace DistributedHardware { -DistributedHardwareFwkKit::DistributedHardwareFwkKit() : listenerMap_({}), isDHFWKOnLine_(false) + +DistributedHardwareFwkKit::DistributedHardwareFwkKit() : isDHFWKOnLine_(false) { DHLOGI("Ctor DistributedHardwareFwkKit"); DHFWKSAManager::GetInstance().RegisterSAStateCallback( @@ -49,19 +50,27 @@ int32_t DistributedHardwareFwkKit::RegisterPublisherListener(const DHTopic topic } int32_t ret = DH_FWK_SUCCESS; + std::lock_guard publisherListenersLock(DHFWKSAManager::publisherListenersMutex_); if (DHFWKSAManager::GetInstance().GetDHFWKProxy() != nullptr) { ret = DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterPublisherListener(topic, listener); DHLOGI("Register publisher listener to DHFWK, ret: %" PRId32, ret); + if (DHFWKSAManager::publisherListenersCahce_.size() >= MAX_TOPIC_SIZE || + DHFWKSAManager::publisherListenersCahce_[topic].size() >= MAX_LISTENER_SIZE) { + DHLOGE("listeners are over size!"); + return ERR_DH_FWK_PUBLISH_LISTENER_OVER_SIZE; + } + if (ret == DH_FWK_SUCCESS) { + DHFWKSAManager::publisherListenersCahce_[topic].insert(listener); + } } else { DHLOGI("DHFWK not online, or get proxy failed, save listener temporary"); - std::lock_guard lock(listenerMutex_); - if (listenerMap_.size() >= MAX_TOPIC_SIZE || listenerMap_[topic].size() >= MAX_LISTENER_SIZE) { + if (DHFWKSAManager::publisherListenersCahce_.size() >= MAX_TOPIC_SIZE || + DHFWKSAManager::publisherListenersCahce_[topic].size() >= MAX_LISTENER_SIZE) { DHLOGE("listeners are over size!"); return ERR_DH_FWK_PUBLISH_LISTENER_OVER_SIZE; } - listenerMap_[topic].insert(listener); + DHFWKSAManager::publisherListenersCahce_[topic].insert(listener); } - return ret; } @@ -79,9 +88,8 @@ int32_t DistributedHardwareFwkKit::UnregisterPublisherListener(const DHTopic top ret = DHFWKSAManager::GetInstance().GetDHFWKProxy()->UnregisterPublisherListener(topic, listener); DHLOGI("Unregister publisher listener to DHFWK, ret: %" PRId32, ret); } - std::lock_guard lock(listenerMutex_); - listenerMap_[topic].erase(listener); - + std::lock_guard publisherListenersLock(DHFWKSAManager::publisherListenersMutex_); + DHFWKSAManager::publisherListenersCahce_[topic].erase(listener); return ret; } @@ -117,29 +125,6 @@ void DistributedHardwareFwkKit::OnDHFWKOnLine(bool isOnLine) { DHLOGI("Receive DHFWK online callback, %s", (isOnLine ? "true" : "false")); isDHFWKOnLine_ = isOnLine; - - if (DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) { - return; - } - - DHLOGI("DHFWK online, register saved listener to it"); - std::unordered_map>> regSuccListeners; - std::lock_guard lock(listenerMutex_); - for (const auto &entry : listenerMap_) { - for (const auto &listener : entry.second) { - int32_t ret = - DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterPublisherListener(entry.first, listener); - if (ret == DH_FWK_SUCCESS) { - regSuccListeners[entry.first].insert(listener); - } - } - } - - for (const auto &succ : regSuccListeners) { - for (const auto &listener : succ.second) { - listenerMap_[succ.first].erase(listener); - } - } } bool DistributedHardwareFwkKit::IsQueryLocalSysSpecTypeValid(QueryLocalSysSpecType spec) @@ -221,7 +206,8 @@ int32_t DistributedHardwareFwkKit::RegisterCtlCenterCallback(int32_t engineId, DHLOGI("DHFWK not online or get proxy failed, can not register av control center callback."); return ERR_DH_FWK_POINTER_IS_NULL; } - + std::lock_guard avTransControlCenterCbLock(DHFWKSAManager::avTransControlCenterCbMutex_); + DHFWKSAManager::avTransControlCenterCbCache_[engineId] = callback; return DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterCtlCenterCallback(engineId, callback); } @@ -260,5 +246,6 @@ int32_t DistributedHardwareFwkKit::StopDistributedHardware(DHType dhType, const return DHFWKSAManager::GetInstance().GetDHFWKProxy()->StopDistributedHardware(dhType, networkId); } + } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp b/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp index 556d566f..ee75ea8c 100644 --- a/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp +++ b/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp @@ -22,9 +22,16 @@ #include "distributed_hardware_log.h" #include "distributed_hardware_proxy.h" +#include "distributed_hardware_errno.h" +#include "distributed_hardware_fwk_kit.h" namespace OHOS { namespace DistributedHardware { +std::mutex DHFWKSAManager::publisherListenersMutex_; +std::unordered_map>> DHFWKSAManager::publisherListenersCahce_; +std::mutex DHFWKSAManager::avTransControlCenterCbMutex_; +std::unordered_map> DHFWKSAManager::avTransControlCenterCbCache_; + IMPLEMENT_SINGLE_INSTANCE(DHFWKSAManager); DHFWKSAManager::DHFWKSAManager() : dhfwkOnLine_(false), isSubscribeDHFWKSAChangeListener(false), dhfwkProxy_(nullptr), @@ -112,6 +119,9 @@ void DHFWKSAManager::SystemAbilityListener::OnAddSystemAbility(int32_t systemAbi DHFWKSAManager::GetInstance().saStateCallback(true); } } + if (RestoreListener() != DH_FWK_SUCCESS) { + DHLOGE("Partial listeners failed to restore"); + } DHLOGI("sa %" PRId32 " started", systemAbilityId); } @@ -136,5 +146,35 @@ void DHFWKSAManager::SystemAbilityListener::OnRemoveSystemAbility(int32_t system } DHLOGI("sa %" PRId32 " stopped", systemAbilityId); } + +int32_t DHFWKSAManager::RestoreListener() +{ + DHLOGI("Restore the failed listeners due to sa crash"); + if (DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) { + return ERR_DH_FWK_POINTER_IS_NULL; + } + int32_t ret = DH_FWK_SUCCESS; + std::lock_guard publisherListenersLock(publisherListenersMutex_); + for (const auto &entry : publisherListenersCahce_) { + for (const auto &listener : entry.second) { + int32_t innerRet = + DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterPublisherListener(entry.first, listener); + if (ret != DH_FWK_SUCCESS) { + ret = innerRet; + DHLOGE("Register publisher listener failed, topic: %" PRIu32, (uint32_t)entry.first); + } + } + } + std::lock_guard avTransControlCenterCbLock(avTransControlCenterCbMutex_); + for (auto &entry : avTransControlCenterCbCache_) { + int32_t innerRet = + DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterCtlCenterCallback(entry.first, entry.second); + if (innerRet != DH_FWK_SUCCESS) { + ret = innerRet; + DHLOGE("Restore register av control center callback failed, engineId: %" PRId32, entry.first); + } + } + return ret; +} } // DistributedHardware } // OHOS \ No newline at end of file -- Gitee From 82214c3399b9c4b97eaadeecf2cfb25bd1f0e237 Mon Sep 17 00:00:00 2001 From: s30051537 Date: Mon, 29 Jan 2024 11:49:07 +0800 Subject: [PATCH 7/9] =?UTF-8?q?SA=E5=B4=A9=E6=BA=83=E5=90=8E=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E4=B8=9A=E5=8A=A1=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: s30051537 --- .../dscreen_input_test/dscreen_input_test.cpp | 1 - .../inner_kits/include/ipc/dhfwk_sa_manager.h | 17 +++-- .../src/distributed_hardware_fwk_kit.cpp | 28 +++----- .../inner_kits/src/ipc/dhfwk_sa_manager.cpp | 71 +++++++++++++------ 4 files changed, 69 insertions(+), 48 deletions(-) diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_input/dscreen_input_test/dscreen_input_test.cpp b/av_transport/av_trans_engine/plugin/test/av_trans_input/dscreen_input_test/dscreen_input_test.cpp index 63105586..79b41272 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_input/dscreen_input_test/dscreen_input_test.cpp +++ b/av_transport/av_trans_engine/plugin/test/av_trans_input/dscreen_input_test/dscreen_input_test.cpp @@ -67,6 +67,5 @@ HWTEST_F(DscreenInputTest, PushData_001, TestSize.Level0) ret = plugin->PushData("", buffer, 0); EXPECT_EQ(Status::OK, ret); } - } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/interfaces/inner_kits/include/ipc/dhfwk_sa_manager.h b/interfaces/inner_kits/include/ipc/dhfwk_sa_manager.h index 9dce2eaa..ecf21521 100644 --- a/interfaces/inner_kits/include/ipc/dhfwk_sa_manager.h +++ b/interfaces/inner_kits/include/ipc/dhfwk_sa_manager.h @@ -40,6 +40,11 @@ public: sptr GetDHFWKProxy(); void RegisterSAStateCallback(DHFWKSAStateCb callback); + int32_t AddPublisherListenerToCache(const DHTopic topic, sptr listener); + void RemovePublisherListenerFromCache(const DHTopic topic, sptr listener); + void AddAVTransControlCenterCbToCache(int32_t engineId, const sptr callback); + void RemoveAVTransControlCenterCbFromCache(int32_t engineId); + public: class SystemAbilityListener : public SystemAbilityStatusChangeStub { public: @@ -48,13 +53,7 @@ public: }; private: - static int32_t RestoreListener(); - -public: - static std::mutex publisherListenersMutex_; - static std::unordered_map>> publisherListenersCahce_; - static std::mutex avTransControlCenterCbMutex_; - static std::unordered_map> avTransControlCenterCbCache_; + int32_t RestoreListener(); private: std::atomic dhfwkOnLine_; @@ -64,6 +63,10 @@ private: sptr saListener_; std::mutex saStatCbMutex_; DHFWKSAStateCb saStateCallback; + std::mutex publisherListenersMutex_; + std::unordered_map>> publisherListenersCache_; + std::mutex avTransControlCenterCbMutex_; + std::unordered_map> avTransControlCenterCbCache_; }; } // DistributedHardware } // OHOS diff --git a/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp b/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp index 8f9d0d11..0ff888a2 100644 --- a/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp +++ b/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp @@ -26,7 +26,6 @@ namespace OHOS { namespace DistributedHardware { - DistributedHardwareFwkKit::DistributedHardwareFwkKit() : isDHFWKOnLine_(false) { DHLOGI("Ctor DistributedHardwareFwkKit"); @@ -50,27 +49,17 @@ int32_t DistributedHardwareFwkKit::RegisterPublisherListener(const DHTopic topic } int32_t ret = DH_FWK_SUCCESS; - std::lock_guard publisherListenersLock(DHFWKSAManager::publisherListenersMutex_); if (DHFWKSAManager::GetInstance().GetDHFWKProxy() != nullptr) { ret = DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterPublisherListener(topic, listener); DHLOGI("Register publisher listener to DHFWK, ret: %" PRId32, ret); - if (DHFWKSAManager::publisherListenersCahce_.size() >= MAX_TOPIC_SIZE || - DHFWKSAManager::publisherListenersCahce_[topic].size() >= MAX_LISTENER_SIZE) { - DHLOGE("listeners are over size!"); - return ERR_DH_FWK_PUBLISH_LISTENER_OVER_SIZE; - } if (ret == DH_FWK_SUCCESS) { - DHFWKSAManager::publisherListenersCahce_[topic].insert(listener); + return DHFWKSAManager::GetInstance().AddPublisherListenerToCache(topic, listener); } } else { DHLOGI("DHFWK not online, or get proxy failed, save listener temporary"); - if (DHFWKSAManager::publisherListenersCahce_.size() >= MAX_TOPIC_SIZE || - DHFWKSAManager::publisherListenersCahce_[topic].size() >= MAX_LISTENER_SIZE) { - DHLOGE("listeners are over size!"); - return ERR_DH_FWK_PUBLISH_LISTENER_OVER_SIZE; - } - DHFWKSAManager::publisherListenersCahce_[topic].insert(listener); + return DHFWKSAManager::GetInstance().AddPublisherListenerToCache(topic, listener); } + return ret; } @@ -88,8 +77,8 @@ int32_t DistributedHardwareFwkKit::UnregisterPublisherListener(const DHTopic top ret = DHFWKSAManager::GetInstance().GetDHFWKProxy()->UnregisterPublisherListener(topic, listener); DHLOGI("Unregister publisher listener to DHFWK, ret: %" PRId32, ret); } - std::lock_guard publisherListenersLock(DHFWKSAManager::publisherListenersMutex_); - DHFWKSAManager::publisherListenersCahce_[topic].erase(listener); + + DHFWKSAManager::GetInstance().RemovePublisherListenerFromCache(topic, listener); return ret; } @@ -168,7 +157,8 @@ int32_t DistributedHardwareFwkKit::ReleaseAVCenter(int32_t engineId) DHLOGI("DHFWK not online or get proxy failed, can not release av control center"); return ERR_DH_FWK_POINTER_IS_NULL; } - + + DHFWKSAManager::GetInstance().RemoveAVTransControlCenterCbFromCache(engineId); return DHFWKSAManager::GetInstance().GetDHFWKProxy()->ReleaseAVCenter(engineId); } @@ -206,8 +196,7 @@ int32_t DistributedHardwareFwkKit::RegisterCtlCenterCallback(int32_t engineId, DHLOGI("DHFWK not online or get proxy failed, can not register av control center callback."); return ERR_DH_FWK_POINTER_IS_NULL; } - std::lock_guard avTransControlCenterCbLock(DHFWKSAManager::avTransControlCenterCbMutex_); - DHFWKSAManager::avTransControlCenterCbCache_[engineId] = callback; + DHFWKSAManager::GetInstance().AddAVTransControlCenterCbToCache(engineId, callback); return DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterCtlCenterCallback(engineId, callback); } @@ -246,6 +235,5 @@ int32_t DistributedHardwareFwkKit::StopDistributedHardware(DHType dhType, const return DHFWKSAManager::GetInstance().GetDHFWKProxy()->StopDistributedHardware(dhType, networkId); } - } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp b/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp index ee75ea8c..ec82da2a 100644 --- a/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp +++ b/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp @@ -20,22 +20,18 @@ #include "iservice_registry.h" #include "system_ability_definition.h" +#include "constants.h" #include "distributed_hardware_log.h" #include "distributed_hardware_proxy.h" #include "distributed_hardware_errno.h" -#include "distributed_hardware_fwk_kit.h" namespace OHOS { namespace DistributedHardware { -std::mutex DHFWKSAManager::publisherListenersMutex_; -std::unordered_map>> DHFWKSAManager::publisherListenersCahce_; -std::mutex DHFWKSAManager::avTransControlCenterCbMutex_; -std::unordered_map> DHFWKSAManager::avTransControlCenterCbCache_; - IMPLEMENT_SINGLE_INSTANCE(DHFWKSAManager); DHFWKSAManager::DHFWKSAManager() : dhfwkOnLine_(false), isSubscribeDHFWKSAChangeListener(false), dhfwkProxy_(nullptr), - saListener_(new SystemAbilityListener()), saStateCallback(nullptr) + saListener_(new SystemAbilityListener()), saStateCallback(nullptr), + publisherListenersCache_({}), avTransControlCenterCbCache_({}) { DHLOGI("Ctor DHFWKSAManager"); } @@ -119,7 +115,7 @@ void DHFWKSAManager::SystemAbilityListener::OnAddSystemAbility(int32_t systemAbi DHFWKSAManager::GetInstance().saStateCallback(true); } } - if (RestoreListener() != DH_FWK_SUCCESS) { + if (DHFWKSAManager::GetInstance().RestoreListener() != DH_FWK_SUCCESS) { DHLOGE("Partial listeners failed to restore"); } DHLOGI("sa %" PRId32 " started", systemAbilityId); @@ -154,27 +150,62 @@ int32_t DHFWKSAManager::RestoreListener() return ERR_DH_FWK_POINTER_IS_NULL; } int32_t ret = DH_FWK_SUCCESS; - std::lock_guard publisherListenersLock(publisherListenersMutex_); - for (const auto &entry : publisherListenersCahce_) { - for (const auto &listener : entry.second) { - int32_t innerRet = - DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterPublisherListener(entry.first, listener); + { + std::lock_guard publisherListenersLock(publisherListenersMutex_); + for (const auto &entry : publisherListenersCache_) { + for (const auto &listener : entry.second) { + int32_t innerRet = + DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterPublisherListener(entry.first, listener); if (ret != DH_FWK_SUCCESS) { ret = innerRet; DHLOGE("Register publisher listener failed, topic: %" PRIu32, (uint32_t)entry.first); + } } } } - std::lock_guard avTransControlCenterCbLock(avTransControlCenterCbMutex_); - for (auto &entry : avTransControlCenterCbCache_) { - int32_t innerRet = - DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterCtlCenterCallback(entry.first, entry.second); - if (innerRet != DH_FWK_SUCCESS) { - ret = innerRet; - DHLOGE("Restore register av control center callback failed, engineId: %" PRId32, entry.first); + { + std::lock_guard avTransControlCenterCbLock(avTransControlCenterCbMutex_); + for (auto &entry : avTransControlCenterCbCache_) { + int32_t innerRet = + DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterCtlCenterCallback(entry.first, entry.second); + if (innerRet != DH_FWK_SUCCESS) { + ret = innerRet; + DHLOGE("Restore register av control center callback failed, engineId: %" PRId32, entry.first); + } } } return ret; } + +int32_t DHFWKSAManager::AddPublisherListenerToCache(const DHTopic topic, sptr listener) +{ + std::lock_guard publisherListenersLock(publisherListenersMutex_); + if (publisherListenersCache_.size() >= MAX_TOPIC_SIZE || + publisherListenersCache_[topic].size() >= MAX_LISTENER_SIZE) { + DHLOGE("listeners are over size!"); + return ERR_DH_FWK_PUBLISH_LISTENER_OVER_SIZE; + } + publisherListenersCache_[topic].insert(listener); + return DH_FWK_SUCCESS; +} + +void DHFWKSAManager::RemovePublisherListenerFromCache(const DHTopic topic, sptr listener) +{ + std::lock_guard publisherListenersLock(publisherListenersMutex_); + publisherListenersCache_[topic].erase(listener); +} + +void DHFWKSAManager::AddAVTransControlCenterCbToCache(int32_t engineId, + const sptr callback) +{ + std::lock_guard avTransControlCenterCbLock(avTransControlCenterCbMutex_); + avTransControlCenterCbCache_[engineId] = callback; +} + +void DHFWKSAManager::RemoveAVTransControlCenterCbFromCache(int32_t engineId) +{ + std::lock_guard avTransControlCenterCbLock(avTransControlCenterCbMutex_); + avTransControlCenterCbCache_.erase(engineId); +} } // DistributedHardware } // OHOS \ No newline at end of file -- Gitee From 4f357452733d1a03cdb105d0beb635fedb7e37c3 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Mon, 29 Jan 2024 19:26:10 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B1=E8=B4=A5UT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../component_privacy/component_privacy_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_privacy/component_privacy_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_privacy/component_privacy_test.cpp index 87b917e4..19025e5e 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_privacy/component_privacy_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_privacy/component_privacy_test.cpp @@ -71,7 +71,7 @@ HWTEST_F(ComponentPrivacyTest, StartPrivacePage_001, TestSize.Level0) std::string subtype = "mic"; std::string networkId = "networkId_test"; int32_t ret = compPrivacy_->StartPrivacePage(subtype, networkId); - EXPECT_EQ(AAFwk::RESOLVE_ABILITY_ERR, ret); + EXPECT_EQ(DH_FWK_SUCCESS, ret); } HWTEST_F(ComponentPrivacyTest, StartPrivacePage_002, TestSize.Level0) @@ -79,21 +79,21 @@ HWTEST_F(ComponentPrivacyTest, StartPrivacePage_002, TestSize.Level0) std::string subtype = "camera"; std::string networkId = "networkId_test"; int32_t ret = compPrivacy_->StartPrivacePage(subtype, networkId); - EXPECT_EQ(AAFwk::RESOLVE_ABILITY_ERR, ret); + EXPECT_EQ(DH_FWK_SUCCESS, ret); } HWTEST_F(ComponentPrivacyTest, StopPrivacePage_001, TestSize.Level0) { std::string subtype = "mic"; int32_t ret = compPrivacy_->StopPrivacePage(subtype); - EXPECT_EQ(AAFwk::RESOLVE_ABILITY_ERR, ret); + EXPECT_EQ(DH_FWK_SUCCESS, ret); } HWTEST_F(ComponentPrivacyTest, StopPrivacePage_002, TestSize.Level0) { std::string subtype = "camera"; int32_t ret = compPrivacy_->StopPrivacePage(subtype); - EXPECT_EQ(AAFwk::RESOLVE_ABILITY_ERR, ret); + EXPECT_EQ(DH_FWK_SUCCESS, ret); } HWTEST_F(ComponentPrivacyTest, DeviceTypeToString_001, TestSize.Level0) -- Gitee From 04f46ffa5a7ab3c79dae889ed875a3d7507d13f0 Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Wed, 31 Jan 2024 06:39:08 +0000 Subject: [PATCH 9/9] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!500?= =?UTF-8?q?=20:=20=E5=9B=9E=E9=80=80=20'Pull=20Request=20!489=20:=20distri?= =?UTF-8?q?butedhardware=5Fdistributed=5Fhardware=5Ffwk=E4=BB=93=E9=80=82?= =?UTF-8?q?=E9=85=8Dgoogletest1.13.0''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/test/unittest/common/eventbus/event_bus_test.cpp | 1 - utils/test/unittest/common/eventbus/event_bus_test.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/test/unittest/common/eventbus/event_bus_test.cpp b/utils/test/unittest/common/eventbus/event_bus_test.cpp index 400eafef..78b2b81c 100644 --- a/utils/test/unittest/common/eventbus/event_bus_test.cpp +++ b/utils/test/unittest/common/eventbus/event_bus_test.cpp @@ -15,7 +15,6 @@ #include "event_bus_test.h" -#include #include #include #include diff --git a/utils/test/unittest/common/eventbus/event_bus_test.h b/utils/test/unittest/common/eventbus/event_bus_test.h index 3d953e75..e3be69e1 100644 --- a/utils/test/unittest/common/eventbus/event_bus_test.h +++ b/utils/test/unittest/common/eventbus/event_bus_test.h @@ -17,6 +17,7 @@ #define OHOS_DISTRIBUTED_HARDWARE_EVENT_BUS_TEST_H #include +#include #include #include -- Gitee