diff --git a/notification.gni b/notification.gni index d7cf9b918b8a0461b9fd1c6815abc0adf54dc736..fd49ed488490e913b3d83bbcc7691071c368b4b3 100644 --- a/notification.gni +++ b/notification.gni @@ -41,3 +41,11 @@ component_external_deps = [ "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", ] + +declare_args() { + device_usage = true + if (defined(global_parts_info) && + !defined(global_parts_info.device_usage_statistics)) { + device_usage = false + } +} diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index ce40019bc038ff5bd7a47f72f3597bba2294ea1e..a664a86d3b27992af4d366a26e73bc7a6c882374 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -79,7 +79,6 @@ ohos_shared_library("libans") { "ability_runtime:app_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", - "device_usage_statistics:usagestatsinner", "distributeddatamgr:distributeddata_inner", "multimedia_image_standard:image_native", "multimedia_media_standard:media_client", @@ -89,6 +88,11 @@ ohos_shared_library("libans") { ] external_deps += component_external_deps + if (device_usage) { + external_deps += [ "device_usage_statistics:usagestatsinner" ] + defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp index 77d4781dc2e518c3e832150ea48f5dfbe5f74507..5d846f9868d3b02f83d5c26fb17356e1ac4e692f 100644 --- a/services/ans/src/advanced_notification_service.cpp +++ b/services/ans/src/advanced_notification_service.cpp @@ -29,7 +29,9 @@ #include "ans_watchdog.h" #include "ans_permission_def.h" #include "bundle_manager_helper.h" +#ifdef DEVICE_USAGE_STATISTICS_ENABLE #include "bundle_active_client.h" +#endif #include "common_event_manager.h" #include "common_event_support.h" #include "display_manager.h" @@ -484,8 +486,10 @@ ErrCode AdvancedNotificationService::Publish(const std::string &label, const spt void AdvancedNotificationService::ReportInfoToResourceSchedule(const int32_t userId, const std::string &bundleName) { +#ifdef DEVICE_USAGE_STATISTICS_ENABLE DeviceUsageStats::BundleActiveEvent event(DeviceUsageStats::BundleActiveEvent::NOTIFICATION_SEEN, bundleName); DeviceUsageStats::BundleActiveClient::GetInstance().ReportEvent(event, userId); +#endif } bool AdvancedNotificationService::IsNotificationExists(const std::string &key) diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index dfe7650eb4f8316db8404a068fe8b30e847ff229..4dd3cbafcee7e55557e3e89f8d0fbcbd7d130968 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -85,7 +85,6 @@ ohos_unittest("ans_unit_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "common_event_service:cesfwk_innerkits", - "device_usage_statistics:usagestatsinner", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:libhitrace", @@ -99,6 +98,11 @@ ohos_unittest("ans_unit_test") { "time_native:time_service", ] + if (device_usage) { + external_deps += [ "device_usage_statistics:usagestatsinner" ] + defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" } diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index 73f8e937de560e30dd6b74002af078302a96b94a..83400fd4543bd233fb2592d5918bb2cd9ed1823c 100644 --- a/services/test/moduletest/BUILD.gn +++ b/services/test/moduletest/BUILD.gn @@ -71,7 +71,6 @@ ohos_moduletest("ans_module_test") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "common_event_service:cesfwk_innerkits", - "device_usage_statistics:usagestatsinner", "distributeddatamgr:distributeddata_inner", "eventhandler:libeventhandler", "hitrace_native:libhitrace", @@ -85,6 +84,11 @@ ohos_moduletest("ans_module_test") { "time_native:time_service", ] + if (device_usage) { + external_deps += [ "device_usage_statistics:usagestatsinner" ] + defines += [ "DEVICE_USAGE_STATISTICS_ENABLE" ] + } + subsystem_name = "${subsystem_name}" part_name = "${component_name}" }