From 1774b12fbdf561bdf73bf55719a6a64b2319bc42 Mon Sep 17 00:00:00 2001 From: fengyang Date: Tue, 29 Oct 2024 19:13:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ffrt=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=9C=BA=E5=88=B6=20=EF=BC=88cherry=20picked?= =?UTF-8?q?=20commit=20from=20=20Signed-off-by:=20fengyang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BUILD.gn | 2 ++ bundle.json | 1 + services/common/src/bundle_active_service.cpp | 2 ++ 3 files changed, 5 insertions(+) diff --git a/BUILD.gn b/BUILD.gn index d3a69af..a3d0232 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -204,6 +204,7 @@ ohos_shared_library("usagestatservice") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "hicollie:libhicollie", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_single", @@ -285,6 +286,7 @@ ohos_static_library("usagestatservice_static") { "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "ffrt:libffrt", + "hicollie:libhicollie", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_single", diff --git a/bundle.json b/bundle.json index c1b845b..83e467f 100644 --- a/bundle.json +++ b/bundle.json @@ -31,6 +31,7 @@ "ipc", "access_token", "ability_runtime", + "hicollie", "hilog", "samgr", "c_utils", diff --git a/services/common/src/bundle_active_service.cpp b/services/common/src/bundle_active_service.cpp index a865ca4..3b3ea21 100644 --- a/services/common/src/bundle_active_service.cpp +++ b/services/common/src/bundle_active_service.cpp @@ -31,6 +31,7 @@ #include "bundle_active_bundle_mgr_helper.h" #include "bundle_active_shutdown_callback_service.h" #include "tokenid_kit.h" +#include "xcollie/watchdog.h" #include "bundle_active_service.h" @@ -124,6 +125,7 @@ void BundleActiveService::InitNecessaryState() void BundleActiveService::InitService() { + HiviewDFX::Watchdog::GetInstance().InitFfrtWatchdog(); if (bundleActiveCore_ == nullptr) { bundleActiveCore_ = std::make_shared(); bundleActiveCore_->Init(); -- Gitee