From 6e75da95194067d194b487a066daeca959ce1d68 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Fri, 1 Nov 2024 10:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- bundle.json | 1 - distributedhardwarefwk.gni | 6 --- .../distributedhardwarefwkservice/BUILD.gn | 5 --- .../include/utils/dh_context.h | 21 --------- .../plugin_listener_impl.cpp | 8 ---- .../src/utils/dh_context.cpp | 45 ------------------- .../fuzztest/resourcemanager_fuzzer/BUILD.gn | 5 --- .../unittest/common/accessmanager/BUILD.gn | 5 --- .../unittest/common/componentloader/BUILD.gn | 5 --- .../component_manager/BUILD.gn | 5 --- .../test/unittest/common/dbadapter/BUILD.gn | 5 --- .../distributedhardwaremanager/BUILD.gn | 5 --- .../distributedhardwareservice/BUILD.gn | 5 --- .../localhardwaremanager/BUILD.gn | 5 --- .../unittest/common/resourcemanager/BUILD.gn | 5 --- .../test/unittest/common/transport/BUILD.gn | 5 --- .../test/unittest/common/utils/BUILD.gn | 5 --- .../unittest/common/utils/dh_context_test.cpp | 14 ------ .../versioninfomanager/versioninfo/BUILD.gn | 5 --- .../versioninfomanager/BUILD.gn | 5 --- 20 files changed, 165 deletions(-) diff --git a/bundle.json b/bundle.json index 7633d195..c466e473 100644 --- a/bundle.json +++ b/bundle.json @@ -54,7 +54,6 @@ "graphic_surface", "media_foundation", "bounds_checking_function", - "power_manager", "openssl", "ffmpeg", "zlib", diff --git a/distributedhardwarefwk.gni b/distributedhardwarefwk.gni index d77261bf..7057ac07 100644 --- a/distributedhardwarefwk.gni +++ b/distributedhardwarefwk.gni @@ -36,10 +36,4 @@ build_flags = [ "-Werror" ] declare_args() { distributed_hardware_fwk_low_latency = false - powermgr_power_manager_fwk = true - - if (defined(global_parts_info) && - !defined(global_parts_info.powermgr_power_manager)) { - powermgr_power_manager_fwk = false - } } diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index b855dbaa..ea3349e6 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -164,11 +164,6 @@ ohos_shared_library("distributedhardwarefwksvr") { "samgr:samgr_proxy", ] - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } - subsystem_name = "distributedhardware" part_name = "distributed_hardware_fwk" diff --git a/services/distributedhardwarefwkservice/include/utils/dh_context.h b/services/distributedhardwarefwkservice/include/utils/dh_context.h index 4ee93b14..149de60c 100644 --- a/services/distributedhardwarefwkservice/include/utils/dh_context.h +++ b/services/distributedhardwarefwkservice/include/utils/dh_context.h @@ -16,18 +16,12 @@ #ifndef OHOS_DISTRIBUTED_HARDWARE_DHCONTEXT_H #define OHOS_DISTRIBUTED_HARDWARE_DHCONTEXT_H -#include #include #include #include #include #include -#ifdef POWER_MANAGER_ENABLE -#include "power_mgr_client.h" -#include "power_state_callback_stub.h" -#endif - #include "device_type.h" #include "event_handler.h" #include "ipublisher_listener.h" @@ -109,21 +103,9 @@ public: }; std::shared_ptr GetEventHandler(); - bool IsSleeping(); - void SetIsSleeping(bool isSleeping); uint32_t GetIsomerismConnectCount(); void AddIsomerismConnectDev(const std::string &IsomerismDeviceId); void DelIsomerismConnectDev(const std::string &IsomerismDeviceId); - -private: -#ifdef POWER_MANAGER_ENABLE - class DHFWKPowerStateCallback : public OHOS::PowerMgr::PowerStateCallbackStub { - public: - void OnPowerStateChanged(OHOS::PowerMgr::PowerState state) override; - }; - #endif - void RegisterPowerStateLinstener(); - private: class DHFWKIsomerismListener : public IPublisherListener { public: @@ -144,11 +126,8 @@ private: std::shared_mutex realTimeNetworkIdMutex_; std::shared_ptr eventHandler_; - /* true for system in sleeping, false for NOT in sleeping */ - std::atomic isSleeping_ = false; std::unordered_set connectedDevIds_; - std::shared_mutex connectDevMutex_; }; } // namespace DistributedHardware diff --git a/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp index 06a15d93..3b9e8db0 100644 --- a/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp +++ b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp @@ -36,10 +36,6 @@ void PluginListenerImpl::PluginHardware(const std::string &dhId, const std::stri return; } DHLOGI("plugin start, dhId: %{public}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; @@ -59,10 +55,6 @@ void PluginListenerImpl::UnPluginHardware(const std::string &dhId) return; } DHLOGI("unplugin start, dhId: %{public}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 bae8f409..4ff2d633 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp @@ -34,7 +34,6 @@ DHContext::DHContext() DHLOGI("Ctor DHContext"); std::shared_ptr runner = AppExecFwk::EventRunner::Create(true); eventHandler_ = std::make_shared(runner); - RegisterPowerStateLinstener(); RegisDHFWKIsomerismListener(); } @@ -43,50 +42,6 @@ DHContext::~DHContext() DHLOGI("Dtor DHContext"); } -void DHContext::RegisterPowerStateLinstener() -{ - #ifdef POWER_MANAGER_ENABLE - 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 { - DHLOGI("DHFWK register power state callback success"); - } - #endif -} - -#ifdef POWER_MANAGER_ENABLE -void DHContext::DHFWKPowerStateCallback::OnPowerStateChanged(PowerMgr::PowerState state) -{ - DHLOGI("DHFWK OnPowerStateChanged state: %{public}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); -} -#endif - -bool DHContext::IsSleeping() -{ - return isSleeping_; -} - -void DHContext::SetIsSleeping(bool isSleeping) -{ - isSleeping_ = isSleeping; -} - DHContext::CommonEventHandler::CommonEventHandler(const std::shared_ptr runner) : AppExecFwk::EventHandler(runner) { diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 30634678..6f9c4bf0 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -57,11 +57,6 @@ ohos_fuzztest("ResourceManagerFuzzTest") { "ipc:ipc_single", "kv_store:distributeddata_inner", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index f14a0f80..a7038653 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -69,11 +69,6 @@ ohos_unittest("AccessManagerTest") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } } group("unittest") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn index 7821e817..661d996c 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn @@ -72,11 +72,6 @@ ohos_unittest("ComponentLoaderTest") { if (!distributed_hardware_fwk_low_latency) { defines += [ "DHARDWARE_CLOSE_UT" ] } - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } } group("component_loader_test") { 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 45f05507..5f4a5d11 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn @@ -79,11 +79,6 @@ ohos_unittest("ComponentManagerTest") { if (!distributed_hardware_fwk_low_latency) { defines += [ "DHARDWARE_CLOSE_UT" ] } - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } } group("component_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn index 313ca66c..eb772702 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn @@ -63,11 +63,6 @@ ohos_unittest("DbAdapterTest") { "kv_store:distributeddata_inner", "safwk:system_ability_fwk", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines = [ "POWER_MANAGER_ENABLE" ] - } } group("db_adapter_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn index e0a9163d..0e3ab803 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -59,11 +59,6 @@ ohos_unittest("DistributedHardwareManagerTest") { "-g3", "-Dprivate=public", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } } group("distributed_hardware_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn index b344cdec..e01b6aa9 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn @@ -66,11 +66,6 @@ ohos_unittest("DistributedHardwareServiceTest") { "ipc:ipc_core", "safwk:system_ability_fwk", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } } group("distributed_hardware_service_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn index 48c3d17f..14d9894e 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn @@ -69,11 +69,6 @@ ohos_unittest("LocalHardwareManagerTest") { "-g3", "-Dprivate=public", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } } group("local_hardware_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 2809608b..f0afe06c 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -60,11 +60,6 @@ ohos_unittest("ResourceManagerTest") { "kv_store:distributeddata_inner", "safwk:system_ability_fwk", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines = [ "POWER_MANAGER_ENABLE" ] - } } group("resource_manager_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn index 46bb8b2e..e113f666 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn @@ -60,11 +60,6 @@ ohos_unittest("TransportTest") { "kv_store:distributeddata_inner", "safwk:system_ability_fwk", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines = [ "POWER_MANAGER_ENABLE" ] - } } group("transport_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/utils/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/utils/BUILD.gn index 683a08f3..ef084cea 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/utils/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/utils/BUILD.gn @@ -69,11 +69,6 @@ ohos_unittest("DhContextTest") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] - - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines += [ "POWER_MANAGER_ENABLE" ] - } } group("dh_context_test") { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp index 82ad735d..ba818839 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp @@ -46,20 +46,6 @@ void DhContextTest::SetUpTestCase() {} void DhContextTest::TearDownTestCase() {} -HWTEST_F(DhContextTest, OnPowerStateChanged_001, TestSize.Level1) -{ - sptr powerStateCallback(new DHContext::DHFWKPowerStateCallback()); - ASSERT_TRUE(powerStateCallback != nullptr); - PowerMgr::PowerState state = PowerMgr::PowerState::SLEEP; - powerStateCallback->OnPowerStateChanged(state); - - state = PowerMgr::PowerState::HIBERNATE; - powerStateCallback->OnPowerStateChanged(state); - - state = PowerMgr::PowerState::SHUTDOWN; - powerStateCallback->OnPowerStateChanged(state); -} - HWTEST_F(DhContextTest, AddOnlineDevice_001, TestSize.Level1) { DHContext::GetInstance().AddOnlineDevice("", "", ""); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn index 12ed28dc..201983e9 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfo/BUILD.gn @@ -53,11 +53,6 @@ ohos_unittest("VersionInfoTest") { "safwk:system_ability_fwk", ] - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines = [ "POWER_MANAGER_ENABLE" ] - } - cflags = [ "-Wall", "-Werror", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn index 8889e773..cec0ba0b 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/versioninfomanager/BUILD.gn @@ -55,11 +55,6 @@ ohos_unittest("VersioninfoManagerTest") { "safwk:system_ability_fwk", ] - if (powermgr_power_manager_fwk) { - external_deps += [ "power_manager:powermgr_client" ] - defines = [ "POWER_MANAGER_ENABLE" ] - } - cflags = [ "-Wall", "-Werror", -- Gitee