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 631055869ab817d66ef6300c48ccb406ac47e97f..79b412724d1176b9dc0f635f287c16e48511e31b 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/bundle.json b/bundle.json
index 2bcebbe95f985fdffd27ec12299ff3a031e5bb5e..034171dfaf324dcfa28583e8baa154a732801969 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/interfaces/inner_kits/include/distributed_hardware_fwk_kit.h b/interfaces/inner_kits/include/distributed_hardware_fwk_kit.h
index 1e22a572f268a79584b1a64785ce3faf021315b3..e4d34565b4cfd0cd4967d7d01caa5c075aecc19e 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<DHTopic, std::set<sptr<IPublisherListener>>> listenerMap_;
     std::atomic<bool> 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 ef35c38a4210f1994395b738f5994e595116605e..ecf215212a50c9b5a0d5a261cd53d0be377be7f3 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 <atomic>
 #include <functional>
 #include <mutex>
+#include <set>
 
 #include "refbase.h"
 #include "system_ability_status_change_stub.h"
@@ -39,6 +40,11 @@ public:
     sptr<IDistributedHardware> GetDHFWKProxy();
     void RegisterSAStateCallback(DHFWKSAStateCb callback);
 
+    int32_t AddPublisherListenerToCache(const DHTopic topic, sptr<IPublisherListener> listener);
+    void RemovePublisherListenerFromCache(const DHTopic topic, sptr<IPublisherListener> listener);
+    void AddAVTransControlCenterCbToCache(int32_t engineId, const sptr<IAVTransControlCenterCallback> callback);
+    void RemoveAVTransControlCenterCbFromCache(int32_t engineId);
+
 public:
 class SystemAbilityListener : public SystemAbilityStatusChangeStub {
 public:
@@ -46,6 +52,9 @@ public:
     void OnRemoveSystemAbility(int32_t systemAbilityId, const std::string &deviceId) override;
 };
 
+private:
+    int32_t RestoreListener();
+
 private:
     std::atomic<bool> dhfwkOnLine_;
     std::atomic<bool> isSubscribeDHFWKSAChangeListener;
@@ -54,6 +63,10 @@ private:
     sptr<SystemAbilityListener> saListener_;
     std::mutex saStatCbMutex_;
     DHFWKSAStateCb saStateCallback;
+    std::mutex publisherListenersMutex_;
+    std::unordered_map<DHTopic, std::set<sptr<IPublisherListener>>> publisherListenersCache_;
+    std::mutex avTransControlCenterCbMutex_;
+    std::unordered_map<int32_t, sptr<IAVTransControlCenterCallback>> 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 97ea5d58edf4dbf08e511dee944fc4c7d9134c47..294dabdfa64cd1a3d8f1aa410859e32a426a760c 100644
--- a/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp
+++ b/interfaces/inner_kits/src/distributed_hardware_fwk_kit.cpp
@@ -26,7 +26,7 @@
 
 namespace OHOS {
 namespace DistributedHardware {
-DistributedHardwareFwkKit::DistributedHardwareFwkKit() : listenerMap_({}), isDHFWKOnLine_(false)
+DistributedHardwareFwkKit::DistributedHardwareFwkKit() : isDHFWKOnLine_(false)
 {
     DHLOGI("Ctor DistributedHardwareFwkKit");
     DHFWKSAManager::GetInstance().RegisterSAStateCallback(
@@ -52,14 +52,12 @@ int32_t DistributedHardwareFwkKit::RegisterPublisherListener(const DHTopic topic
     if (DHFWKSAManager::GetInstance().GetDHFWKProxy() != nullptr) {
         ret = DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterPublisherListener(topic, listener);
         DHLOGI("Register publisher listener to DHFWK, ret: %" PRId32, ret);
+        if (ret == DH_FWK_SUCCESS) {
+            return DHFWKSAManager::GetInstance().AddPublisherListenerToCache(topic, listener);
+        }
     } else {
         DHLOGI("DHFWK not online, or get proxy failed, save listener temporary");
-        std::lock_guard<std::mutex> lock(listenerMutex_);
-        if (listenerMap_.size() >= MAX_TOPIC_SIZE || listenerMap_[topic].size() >= MAX_LISTENER_SIZE) {
-            DHLOGE("listeners are over size!");
-            return ERR_DH_FWK_PUBLISH_LISTENER_OVER_SIZE;
-        }
-        listenerMap_[topic].insert(listener);
+        return DHFWKSAManager::GetInstance().AddPublisherListenerToCache(topic, listener);
     }
 
     return ret;
@@ -79,9 +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<std::mutex> lock(listenerMutex_);
-    listenerMap_[topic].erase(listener);
 
+    DHFWKSAManager::GetInstance().RemovePublisherListenerFromCache(topic, listener);
     return ret;
 }
 
@@ -117,29 +114,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<DHTopic, std::set<sptr<IPublisherListener>>> regSuccListeners;
-    std::lock_guard<std::mutex> 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)
@@ -183,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);
 }
 
@@ -221,13 +196,13 @@ 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;
     }
-
+    DHFWKSAManager::GetInstance().AddAVTransControlCenterCbToCache(engineId, callback);
     return DHFWKSAManager::GetInstance().GetDHFWKProxy()->RegisterCtlCenterCallback(engineId, callback);
 }
 
 int32_t DistributedHardwareFwkKit::PauseDistributedHardware(DHType dhType, const std::string &networkId)
 {
-    DHLOGI("Pause distributed hardware dhType %u, networkId %s", (uint32_t)dhType, networkId.c_str());
+    DHLOGI("Pause distributed hardware dhType %u, networkId %s", (uint32_t)dhType, GetAnonyString(networkId).c_str());
 
     if (DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) {
         DHLOGI("DHFWK not online or get proxy failed, can not register av control center callback.");
@@ -239,7 +214,7 @@ int32_t DistributedHardwareFwkKit::PauseDistributedHardware(DHType dhType, const
 
 int32_t DistributedHardwareFwkKit::ResumeDistributedHardware(DHType dhType, const std::string &networkId)
 {
-    DHLOGI("Resume distributed hardware dhType %u, networkId %s", (uint32_t)dhType, networkId.c_str());
+    DHLOGI("Resume distributed hardware dhType %u, networkId %s", (uint32_t)dhType, GetAnonyString(networkId).c_str());
 
     if (DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) {
         DHLOGI("DHFWK not online or get proxy failed, can not register av control center callback.");
@@ -251,7 +226,7 @@ int32_t DistributedHardwareFwkKit::ResumeDistributedHardware(DHType dhType, cons
 
 int32_t DistributedHardwareFwkKit::StopDistributedHardware(DHType dhType, const std::string &networkId)
 {
-    DHLOGI("Stop distributed hardware dhType %u, networkId %s", (uint32_t)dhType, networkId.c_str());
+    DHLOGI("Stop distributed hardware dhType %u, networkId %s", (uint32_t)dhType, GetAnonyString(networkId).c_str());
 
     if (DHFWKSAManager::GetInstance().GetDHFWKProxy() == nullptr) {
         DHLOGI("DHFWK not online or get proxy failed, can not register av control center callback.");
diff --git a/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp b/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp
index 556d566f96b2afb7240d0e9ad93fb688157931ec..ec82da2ad6247f2a3922d081167b0684d78e5272 100644
--- a/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp
+++ b/interfaces/inner_kits/src/ipc/dhfwk_sa_manager.cpp
@@ -20,15 +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"
 
 namespace OHOS {
 namespace DistributedHardware {
 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");
 }
@@ -112,6 +115,9 @@ void DHFWKSAManager::SystemAbilityListener::OnAddSystemAbility(int32_t systemAbi
             DHFWKSAManager::GetInstance().saStateCallback(true);
         }
     }
+    if (DHFWKSAManager::GetInstance().RestoreListener() != DH_FWK_SUCCESS) {
+        DHLOGE("Partial listeners failed to restore");
+    }
     DHLOGI("sa %" PRId32 " started", systemAbilityId);
 }
 
@@ -136,5 +142,70 @@ 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<std::mutex> 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<std::mutex> 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<IPublisherListener> listener)
+{
+    std::lock_guard<std::mutex> 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<IPublisherListener> listener)
+{
+    std::lock_guard<std::mutex> publisherListenersLock(publisherListenersMutex_);
+    publisherListenersCache_[topic].erase(listener);
+}
+
+void DHFWKSAManager::AddAVTransControlCenterCbToCache(int32_t engineId,
+    const sptr<IAVTransControlCenterCallback> callback)
+{
+    std::lock_guard<std::mutex> avTransControlCenterCbLock(avTransControlCenterCbMutex_);
+    avTransControlCenterCbCache_[engineId] = callback;
+}
+
+void DHFWKSAManager::RemoveAVTransControlCenterCbFromCache(int32_t engineId)
+{
+    std::lock_guard<std::mutex> avTransControlCenterCbLock(avTransControlCenterCbMutex_);
+    avTransControlCenterCbCache_.erase(engineId);
+}
 } // DistributedHardware
 } // OHOS
\ No newline at end of file
diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn
index 117a506a57afd60866852820a7c2552769a8ab49..8074d244922ca6117578262ee2309c64a3ab0de6 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 a62afa03990b58a761b319cc76b877b8e76cd46b..c7869ea0336af7c8e37e3a8a5e16776e52481465 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 <atomic>
 #include <memory>
 #include <string>
 #include <unordered_set>
 #include <shared_mutex>
 
+#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<DHContext::CommonEventHandler> 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<std::string, std::string> onlineDeviceMap_;
+    std::unordered_map<std::string, std::string> onlineDeviceMap_ = {};
 
     /* Save online device hashed uuid and uuid */
-    std::unordered_map<std::string, std::string> deviceIdUUIDMap_;
+    std::unordered_map<std::string, std::string> deviceIdUUIDMap_ = {};
     std::shared_mutex onlineDevMutex_;
 
     std::shared_ptr<DHContext::CommonEventHandler> eventHandler_;
+    /* true for system in sleeping, false for NOT in sleeping */
+    std::atomic<bool> isSleeping_ = false;
 };
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp
index 35eae6573d3dc6b2ff459641bd2a18ae83d51434..4b021b66c2db2ca0be73b51c4db7e041012c7b67 100644
--- a/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp
+++ b/services/distributedhardwarefwkservice/src/componentmanager/component_manager.cpp
@@ -446,7 +446,7 @@ int32_t ComponentManager::Disable(const std::string &networkId, const std::strin
 {
     auto find = compSource_.find(dhType);
     if (find == compSource_.end()) {
-        DHLOGE("can not find handler for dhId = %s.", dhId.c_str());
+        DHLOGE("can not find handler for dhId = %s.", GetAnonyString(dhId).c_str());
         return ERR_DH_FWK_PARA_INVALID;
     }
 
diff --git a/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp
index fe50486f7dbde9b41d9b0f90aa0e206fc8a905cf..5424af283ac7eaa98ac35ece5e74a91628b24ea5 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<std::shared_ptr<CapabilityInfo>> 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<CapabilityInfo> 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 57c066c91ca7466550ccdf4801004a3ce09133e1..0deec491e58fc1f2b46d5033aba4f57245ef065c 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<AppExecFwk::EventRunner> runner = AppExecFwk::EventRunner::Create(true);
     eventHandler_ = std::make_shared<DHContext::CommonEventHandler>(runner);
+    RegisterPowerStateLinstener();
 }
 
 DHContext::~DHContext()
@@ -37,6 +38,46 @@ DHContext::~DHContext()
     DHLOGI("Dtor DHContext");
 }
 
+void DHContext::RegisterPowerStateLinstener()
+{
+    sptr<PowerMgr::IPowerStateCallback> 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<uint32_t>(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<AppExecFwk::EventRunner> &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 9acd72e55eae95a1029daac90288a5dbe4c30d52..1032e67212f6cca7b88de11de518ba3fd1974efd 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/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
index 490c99d5ed3a309a65c0f0fcc669120856cc74b0..dcbc89f51c542572f8ebb0cc8ed5ae663d8437f7 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 35a03a685bccf5d775128c9faf6ae3320f43f282..193efc0564c1c6c49a4f3b21d390ee9a18f62f11 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 afc1fb71e12344cbc573d0bcb548bd2c0ed27b80..5c83232ce23e9fa2f4def2cf9d05b2aea9029939 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn
@@ -68,6 +68,7 @@ ohos_unittest("ComponentManagerTest") {
     "eventhandler:libeventhandler",
     "ipc:ipc_single",
     "kv_store:distributeddata_inner",
+    "power_manager:powermgr_client",
   ]
 
   defines = [
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 87b917e4f4d5804acf4ec3dc889fdf39e34246f3..19025e5e58fe938cd8570a458be00a446cbe2354 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)
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn
index 2e404e1621426c909bd7494c164896d264206df6..370032e45e1d19d459678aa2af231ae873ab6741 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 caa0a7b9d0353e68dbecd5a163881e193d78f0bc..9017a5150508265e78fc2ea95eb8f5970fdba5c9 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 432b09052f7af018abe8f68313faf0c0ca9efa83..b1ffab8bc24bcc936368c87f90324088ff9837a5 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 aa5f97731d6b021475f3c72a4888b0c227f9bbcc..7905c5e84cef39b8e804fb5eb2d5f2a57281a45a 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 18d2e28067f1c65f25b37d41881ca67cd225c92b..15157c635abe9ebe3f05df39a943b1536646d6c2 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 e4b51703302b2e8411bbe7d2b6046a9721504cb9..ac50f7da1c54e4365be8b4134fa2158aaa70d485 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 38a9c45ddb66316900742bd285cc6018ec219fe4..d9cfa77b9048e86aa1aa717efb1e6a01933bc670 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/eventbus/event_bus_test.cpp b/utils/test/unittest/common/eventbus/event_bus_test.cpp
index 400eafeff7ad0ee9ad6f2f3bc5407b062c16c15a..78b2b81cdc5bcd79eed527bb2fa77b24a47fe737 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 <gtest/gtest.h>
 #include <memory>
 #include <new>
 #include <sys/time.h>
diff --git a/utils/test/unittest/common/eventbus/event_bus_test.h b/utils/test/unittest/common/eventbus/event_bus_test.h
index 3d953e75d55a6f156a8b29e3561b841dbf46391f..e3be69e1d811f6a5432784cac77b7fa2e23d09e0 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 <cstdint>
+#include <gtest/gtest.h>
 #include <gtest/gtest_pred_impl.h>
 #include <string>
 
diff --git a/utils/test/unittest/common/eventtrance/BUILD.gn b/utils/test/unittest/common/eventtrance/BUILD.gn
index 4ff0134bd108eb43d2e2dd427d61694ad3357594..e240e684246b313e8e3754a81e9e65a98ff4a8bc 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",
   ]
 }