diff --git a/notification.gni b/notification.gni index f6991faa6ad1bce180b2d86691c0f16cefd19198..87532568ce85d0eb85d95d841836ca9ab0628442 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 163d289809120141b3481d6848370d7fd6eb0f63..6e8995923a5931ad186c38f1715596bd1558b874 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 9b71c44f1346a66fb05958ba69f575004d6f5355..24e9781e286470a2377f373d54a102e4327b9f9d 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 4b6111172d634cc0829f95ae0568bab94faacfec..84cd4ab4f5182b2962ae511f3ade0f7a8d8d47ce 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"