From 2855c0b811bc308f37c533c46803fbf275b4dc78 Mon Sep 17 00:00:00 2001 From: chenqiao Date: Tue, 2 Jul 2024 09:05:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A3=81=E5=89=AAresourcesch?= =?UTF-8?q?edule=E5=AD=90=E7=B3=BB=E7=BB=9F=E7=9A=84device=5Fusage=5Fstati?= =?UTF-8?q?stics=E9=83=A8=E4=BB=B6=E6=97=B6=E7=BC=96=E8=AF=91=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenqiao --- notification.gni | 1 + services/ans/src/advanced_notification_publish_service.cpp | 2 ++ services/ans/src/advanced_notification_service.cpp | 2 ++ services/ans/src/advanced_notification_utils.cpp | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/notification.gni b/notification.gni index f6991faa6..87532568c 100644 --- a/notification.gni +++ b/notification.gni @@ -58,6 +58,7 @@ declare_args() { if (defined(global_parts_info) && !defined(global_parts_info.resourceschedule_device_usage_statistics)) { device_usage = false + distributed_notification_supported = true } if (defined(global_parts_info) && diff --git a/services/ans/src/advanced_notification_publish_service.cpp b/services/ans/src/advanced_notification_publish_service.cpp index 163d28980..6e8995923 100644 --- a/services/ans/src/advanced_notification_publish_service.cpp +++ b/services/ans/src/advanced_notification_publish_service.cpp @@ -28,7 +28,9 @@ #include "notification_constant.h" #include "hitrace_meter_adapter.h" #include "os_account_manager.h" +#ifdef DISTRIBUTED_NOTIFICATION_SUPPORTED #include "distributed_screen_status_manager.h" +#endif #include "notification_local_live_view_subscriber_manager.h" #include "advanced_notification_inline.cpp" diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp index 9b71c44f1..24e9781e2 100644 --- a/services/ans/src/advanced_notification_service.cpp +++ b/services/ans/src/advanced_notification_service.cpp @@ -261,7 +261,9 @@ void AdvancedNotificationService::SelfClean() } NotificationSubscriberManager::GetInstance()->ResetFfrtQueue(); +#ifdef DISTRIBUTED_NOTIFICATION_SUPPORTED DistributedNotificationManager::GetInstance()->ResetFfrtQueue(); +#endif NotificationLocalLiveViewSubscriberManager::GetInstance()->ResetFfrtQueue(); } diff --git a/services/ans/src/advanced_notification_utils.cpp b/services/ans/src/advanced_notification_utils.cpp index 4b6111172..84cd4ab4f 100644 --- a/services/ans/src/advanced_notification_utils.cpp +++ b/services/ans/src/advanced_notification_utils.cpp @@ -28,7 +28,6 @@ #include "notification_constant.h" #include "os_account_manager.h" #include "notification_preferences.h" -#include "distributed_database.h" #include "want_agent_helper.h" #include "hitrace_meter.h" #include "notification_timer_info.h" @@ -38,6 +37,7 @@ #include "distributed_notification_manager.h" #include "distributed_preferences.h" #include "distributed_screen_status_manager.h" +#include "distributed_database.h" #endif #include "advanced_notification_inline.cpp" -- Gitee