From 61282a983f6e53c68192f2e8c43188e51e8562f9 Mon Sep 17 00:00:00 2001 From: oh_ci Date: Tue, 3 Jun 2025 12:37:35 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!14654?= =?UTF-8?q?=20:=20edm=E6=8B=A6=E6=88=AA=E6=97=B6=E4=B8=8A=E6=8A=A5bundleNa?= =?UTF-8?q?me=E4=BF=A1=E6=81=AF'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/c/ability_runtime/BUILD.gn | 1 - .../js/napi/inner/napi_ability_common/BUILD.gn | 1 - frameworks/native/appkit/BUILD.gn | 1 - hisysevent.yaml | 4 ---- interfaces/inner_api/wantagent/BUILD.gn | 1 - services/abilitymgr/include/utils/ability_util.h | 6 +----- .../src/interceptor/control_interceptor.cpp | 5 ++--- .../interceptor/disposed_rule_interceptor.cpp | 7 +++---- services/common/include/event_report.h | 1 - services/common/src/event_report.cpp | 8 -------- .../BUILD.gn | 1 - test/fuzztest/disposedobserver_fuzzer/BUILD.gn | 1 - .../extensionrecordfactory_fuzzer/BUILD.gn | 1 - test/fuzztest/startabilityutils_fuzzer/BUILD.gn | 1 - .../uiextensionrecordfactory_fuzzer/BUILD.gn | 1 - .../ui_extension_connect_module_test/BUILD.gn | 1 - .../ui_extension_info_module_test/BUILD.gn | 1 - .../ui_extension_stability_test/BUILD.gn | 1 - .../ability_connect_callback_proxy_test/BUILD.gn | 1 - .../ability_connect_callback_stub_test/BUILD.gn | 2 -- .../ability_interceptor_third_test/BUILD.gn | 1 - .../ability_manager_proxy_fourth_test/BUILD.gn | 1 - .../ability_manager_proxy_second_test/BUILD.gn | 1 - .../ability_manager_proxy_sixth_test/BUILD.gn | 1 - .../unittest/ability_manager_proxy_test/BUILD.gn | 1 - .../ability_manager_proxy_third_test/BUILD.gn | 1 - .../BUILD.gn | 1 - .../ability_manager_stub_second_test/BUILD.gn | 1 - test/unittest/ability_manager_stub_test/BUILD.gn | 1 - test/unittest/ability_record_first_test/BUILD.gn | 1 - .../unittest/ability_record_second_test/BUILD.gn | 1 - .../ability_scheduler_proxy_test/BUILD.gn | 1 - .../ability_scheduler_stub_second_test/BUILD.gn | 1 - .../ability_scheduler_stub_test/BUILD.gn | 1 - .../unittest/ability_service_start_test/BUILD.gn | 1 - test/unittest/ability_token_proxy_test/BUILD.gn | 1 - test/unittest/ability_token_stub_test/BUILD.gn | 1 - .../BUILD.gn | 1 - .../BUILD.gn | 1 - .../app_service_extension_context_test/BUILD.gn | 1 - .../background_task_observer_test/BUILD.gn | 1 - test/unittest/call_record_test/BUILD.gn | 1 - .../connection_observer_controller_test/BUILD.gn | 1 - test/unittest/connection_record_test/BUILD.gn | 1 - .../unittest/connection_state_item_test/BUILD.gn | 1 - .../connection_state_manager_test/BUILD.gn | 1 - test/unittest/data_ability_record_test/BUILD.gn | 1 - test/unittest/dlp_state_item_test/BUILD.gn | 1 - .../ecological_rule_interceptor_test/BUILD.gn | 1 - .../event_report_test/event_report_test.cpp | 16 ---------------- .../exit_info_data_manager_test/BUILD.gn | 1 - test/unittest/exit_reason_test/BUILD.gn | 1 - .../extension_record_factory_test/BUILD.gn | 1 - test/unittest/lifecycle_deal_test/BUILD.gn | 1 - test/unittest/mission_data_storage_test/BUILD.gn | 1 - .../mission_info_mgr_second_test/BUILD.gn | 1 - test/unittest/mission_info_mgr_test/BUILD.gn | 1 - test/unittest/mission_info_test/BUILD.gn | 1 - test/unittest/mission_list_manager_test/BUILD.gn | 1 - test/unittest/mission_list_test/BUILD.gn | 1 - .../mission_listener_proxy_test/BUILD.gn | 1 - test/unittest/mission_listener_test/BUILD.gn | 1 - test/unittest/mission_test/BUILD.gn | 1 - test/unittest/pending_want_key_test/BUILD.gn | 1 - test/unittest/pending_want_manager_test/BUILD.gn | 1 - test/unittest/recovery_info_timer_test/BUILD.gn | 1 - .../remote_mission_listener_proxy_test/BUILD.gn | 1 - test/unittest/restart_app_manager_test/BUILD.gn | 1 - test/unittest/sender_info_test/BUILD.gn | 1 - .../service_extension_context_test/BUILD.gn | 1 - .../unittest/services/ability_util_test/BUILD.gn | 1 - .../stop_user_callback_proxy_test/BUILD.gn | 1 - .../stop_user_callback_stub_test/BUILD.gn | 1 - .../task_data_persistence_mgr_test/BUILD.gn | 1 - .../ui_extension_record_factory_test/BUILD.gn | 1 - test/unittest/uri_utils_test/BUILD.gn | 1 - test/unittest/user_event_handler_test/BUILD.gn | 1 - test/unittest/want_receiver_proxy_test/BUILD.gn | 1 - test/unittest/want_receiver_stub_test/BUILD.gn | 1 - test/unittest/want_sender_info_test/BUILD.gn | 1 - test/unittest/want_sender_proxy_test/BUILD.gn | 1 - test/unittest/want_sender_stub_test/BUILD.gn | 1 - test/unittest/wants_info_test/BUILD.gn | 1 - 83 files changed, 6 insertions(+), 118 deletions(-) diff --git a/frameworks/c/ability_runtime/BUILD.gn b/frameworks/c/ability_runtime/BUILD.gn index 31a9c580268..b9de638aa71 100644 --- a/frameworks/c/ability_runtime/BUILD.gn +++ b/frameworks/c/ability_runtime/BUILD.gn @@ -67,7 +67,6 @@ ohos_shared_library("ability_runtime") { "ability_base:want", "c_utils:utils", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "image_framework:pixelmap", "ipc:ipc_core", diff --git a/frameworks/js/napi/inner/napi_ability_common/BUILD.gn b/frameworks/js/napi/inner/napi_ability_common/BUILD.gn index 6117a8457d5..c34b9327c98 100644 --- a/frameworks/js/napi/inner/napi_ability_common/BUILD.gn +++ b/frameworks/js/napi/inner/napi_ability_common/BUILD.gn @@ -56,7 +56,6 @@ ohos_shared_library("napi_ability_common") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "ipc:ipc_napi", "napi:ace_napi", diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn index cc0227d2feb..141345396a3 100644 --- a/frameworks/native/appkit/BUILD.gn +++ b/frameworks/native/appkit/BUILD.gn @@ -358,7 +358,6 @@ ohos_shared_library("app_context") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", diff --git a/hisysevent.yaml b/hisysevent.yaml index 99cd08910cb..f796991ac08 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -420,10 +420,6 @@ PROCESS_START_FAILED: REASON: {type: INT32, desc: failed reason} SUB_REASON: {type: INT32, desc: failed sub reason} -APP_START_INTERCRPT_BY_EDM: - __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: app start intercepted by EDM} - BUNDLE_NAME: {type: STRING, desc: bundle name} - DRAWN_COMPLETED: __BASE: {type: BEHAVIOR, level: MINOR, tag: app, desc: drawn completed event reporting} APP_UID: {type: INT32, desc: app uid} diff --git a/interfaces/inner_api/wantagent/BUILD.gn b/interfaces/inner_api/wantagent/BUILD.gn index b1e9d373d3d..a9f3008821c 100644 --- a/interfaces/inner_api/wantagent/BUILD.gn +++ b/interfaces/inner_api/wantagent/BUILD.gn @@ -76,7 +76,6 @@ ohos_shared_library("wantagent_innerkits") { "ability_base:want", "c_utils:utils", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", "jsoncpp:jsoncpp", diff --git a/services/abilitymgr/include/utils/ability_util.h b/services/abilitymgr/include/utils/ability_util.h index c3378f7f7f9..60db8367785 100644 --- a/services/abilitymgr/include/utils/ability_util.h +++ b/services/abilitymgr/include/utils/ability_util.h @@ -24,7 +24,6 @@ #include "ability_manager_errors.h" #include "app_jump_control_rule.h" #include "bundle_mgr_helper.h" -#include "event_report.h" #include "hilog_tag_wrapper.h" #include "in_process_call_wrapper.h" #include "ipc_skeleton.h" @@ -379,12 +378,9 @@ static constexpr int64_t MICROSECONDS = 1000000; // MICROSECONDS mean 10^6 mi return AbilityManagerClient::GetInstance()->StartAbility(want, requestCode, userId); } -inline ErrCode EdmErrorType(bool isEdm, const std::string &bundleName) +inline ErrCode EdmErrorType(bool isEdm) { if (isEdm) { - EventInfo eventInfo; - eventInfo.bundleName = bundleName; - EventReport::SendAbilityEvent(EventName::APP_START_INTERCRPT_BY_EDM, HiSysEventType::BEHAVIOR, eventInfo); return ERR_EDM_APP_CONTROLLED; } return ERR_APP_CONTROLLED; diff --git a/services/abilitymgr/src/interceptor/control_interceptor.cpp b/services/abilitymgr/src/interceptor/control_interceptor.cpp index 2e5de2abdf5..a16512aad2d 100644 --- a/services/abilitymgr/src/interceptor/control_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/control_interceptor.cpp @@ -36,10 +36,9 @@ ErrCode ControlInterceptor::DoProcess(AbilityInterceptorParam param) TAG_LOGI(AAFwkTag::ABILITYMGR, "app is intercepted %{public}s", controlRule.controlMessage.c_str()); #ifdef SUPPORT_GRAPHICS - std::string bundleName = param.abilityInfo ? param.abilityInfo->bundleName : ""; if (!param.isWithUI || controlRule.controlWant == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "no control want"); - return AbilityUtil::EdmErrorType(controlRule.isEdm, bundleName); + return AbilityUtil::EdmErrorType(controlRule.isEdm); } if (controlRule.controlWant->GetBoolParam(IS_FROM_PARENTCONTROL, false)) { auto controlWant = controlRule.controlWant; @@ -61,7 +60,7 @@ ErrCode ControlInterceptor::DoProcess(AbilityInterceptorParam param) return ret; } #endif - return AbilityUtil::EdmErrorType(controlRule.isEdm, bundleName); + return AbilityUtil::EdmErrorType(controlRule.isEdm); } return ERR_OK; } diff --git a/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp b/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp index a5bfd6c8cd3..b6850d7c04c 100644 --- a/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp +++ b/services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp @@ -45,15 +45,14 @@ ErrCode DisposedRuleInterceptor::DoProcess(AbilityInterceptorParam param) "componentType: %{public}d", disposedRule.disposedType, disposedRule.controlType, disposedRule.componentType); #ifdef SUPPORT_GRAPHICS - std::string bundleName = param.abilityInfo ? param.abilityInfo->bundleName : ""; if (!param.isWithUI || disposedRule.want == nullptr || disposedRule.disposedType == AppExecFwk::DisposedType::NON_BLOCK) { TAG_LOGE(AAFwkTag::ABILITYMGR, "no dispose want"); - return AbilityUtil::EdmErrorType(disposedRule.isEdm, bundleName); + return AbilityUtil::EdmErrorType(disposedRule.isEdm); } if (disposedRule.want->GetBundle() == param.want.GetBundle()) { TAG_LOGE(AAFwkTag::ABILITYMGR, "no dispose want, with same bundleName"); - return AbilityUtil::EdmErrorType(disposedRule.isEdm, bundleName); + return AbilityUtil::EdmErrorType(disposedRule.isEdm); } SetInterceptInfo(param.want, disposedRule); if (disposedRule.componentType == AppExecFwk::ComponentType::UI_ABILITY) { @@ -72,7 +71,7 @@ ErrCode DisposedRuleInterceptor::DoProcess(AbilityInterceptorParam param) } } #endif - return AbilityUtil::EdmErrorType(disposedRule.isEdm, bundleName); + return AbilityUtil::EdmErrorType(disposedRule.isEdm); } if (disposedRule.disposedType != AppExecFwk::DisposedType::NON_BLOCK) { return ERR_OK; diff --git a/services/common/include/event_report.h b/services/common/include/event_report.h index a2fe9388b7b..ca71cbbb65b 100644 --- a/services/common/include/event_report.h +++ b/services/common/include/event_report.h @@ -108,7 +108,6 @@ enum class EventName { DRAWN_COMPLETED, APP_STARTUP_TYPE, PROCESS_START_FAILED, - APP_START_INTERCRPT_BY_EDM, // key behavior event GRANT_URI_PERMISSION, diff --git a/services/common/src/event_report.cpp b/services/common/src/event_report.cpp index b3f694de9c4..028d388d79f 100644 --- a/services/common/src/event_report.cpp +++ b/services/common/src/event_report.cpp @@ -104,13 +104,6 @@ void EventReport::SendAppEvent(const EventName &eventName, HiSysEventType type, EVENT_KEY_MODULE_NAME, eventInfo.moduleName, EVENT_KEY_ABILITY_NAME, eventInfo.abilityName); break; - case EventName::APP_START_INTERCRPT_BY_EDM: - HiSysEventWrite( - HiSysEvent::Domain::AAFWK, - name, - type, - EVENT_KEY_BUNDLE_NAME, eventInfo.bundleName); - break; default: HiSysEventWrite( HiSysEvent::Domain::AAFWK, @@ -804,7 +797,6 @@ std::string EventReport::ConvertEventName(const EventName &eventName) // app behavior event "APP_ATTACH", "APP_LAUNCH", "APP_FOREGROUND", "APP_BACKGROUND", "APP_TERMINATE", "PROCESS_START", "PROCESS_EXIT", "DRAWN_COMPLETED", "APP_STARTUP_TYPE", "PROCESS_START_FAILED", - "APP_START_INTERCRPT_BY_EDM", // key behavior event "GRANT_URI_PERMISSION", "FA_SHOW_ON_LOCK", "START_PRIVATE_ABILITY", diff --git a/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn b/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn index 94cec4cd04d..4909864156e 100644 --- a/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymgrdisposedruleinterceptor_fuzzer/BUILD.gn @@ -66,7 +66,6 @@ ohos_fuzztest("AbilitymgrDisposedRuleInterceptorFuzzTest") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", "jsoncpp:jsoncpp", diff --git a/test/fuzztest/disposedobserver_fuzzer/BUILD.gn b/test/fuzztest/disposedobserver_fuzzer/BUILD.gn index 7b77cf3513d..8bb56d954dd 100644 --- a/test/fuzztest/disposedobserver_fuzzer/BUILD.gn +++ b/test/fuzztest/disposedobserver_fuzzer/BUILD.gn @@ -67,7 +67,6 @@ ohos_fuzztest("DisposedObserverFuzzTest") { "common_event_service:cesfwk_innerkits", "ffrt:libffrt", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn b/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn index 5b6af5783ca..faee2e0c12b 100644 --- a/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn +++ b/test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn @@ -64,7 +64,6 @@ ohos_fuzztest("ExtensionRecordFactoryFuzzTest") { "config_policy:configpolicy_util", "ffrt:libffrt", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", diff --git a/test/fuzztest/startabilityutils_fuzzer/BUILD.gn b/test/fuzztest/startabilityutils_fuzzer/BUILD.gn index 28389aa3b04..30f6426b760 100755 --- a/test/fuzztest/startabilityutils_fuzzer/BUILD.gn +++ b/test/fuzztest/startabilityutils_fuzzer/BUILD.gn @@ -71,7 +71,6 @@ ohos_fuzztest("StartAbilityUtilsFuzzTest") { "common_event_service:cesfwk_innerkits", "ffrt:libffrt", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "hitrace:libhitracechain", "input:libmmi-client", diff --git a/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn b/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn index 7cee199ac59..4e9d14936b3 100644 --- a/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn +++ b/test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn @@ -65,7 +65,6 @@ ohos_fuzztest("UIExtensionRecordFactoryFuzzTest") { "config_policy:configpolicy_util", "ffrt:libffrt", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbegetutil", "ipc:ipc_core", diff --git a/test/moduletest/ui_extension_ability_test/ui_extension_connect_module_test/BUILD.gn b/test/moduletest/ui_extension_ability_test/ui_extension_connect_module_test/BUILD.gn index 207a91af51d..0894d2beddf 100644 --- a/test/moduletest/ui_extension_ability_test/ui_extension_connect_module_test/BUILD.gn +++ b/test/moduletest/ui_extension_ability_test/ui_extension_connect_module_test/BUILD.gn @@ -51,7 +51,6 @@ ohos_moduletest("ui_extension_connect_module_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/test/moduletest/ui_extension_ability_test/ui_extension_info_module_test/BUILD.gn b/test/moduletest/ui_extension_ability_test/ui_extension_info_module_test/BUILD.gn index 7886e59bf5b..9dda3c02bcb 100644 --- a/test/moduletest/ui_extension_ability_test/ui_extension_info_module_test/BUILD.gn +++ b/test/moduletest/ui_extension_ability_test/ui_extension_info_module_test/BUILD.gn @@ -46,7 +46,6 @@ ohos_moduletest("ui_extension_info_module_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/test/moduletest/ui_extension_ability_test/ui_extension_stability_test/BUILD.gn b/test/moduletest/ui_extension_ability_test/ui_extension_stability_test/BUILD.gn index 77a731074b6..235ec854fbb 100644 --- a/test/moduletest/ui_extension_ability_test/ui_extension_stability_test/BUILD.gn +++ b/test/moduletest/ui_extension_ability_test/ui_extension_stability_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_moduletest("ui_extension_stability_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/test/unittest/ability_connect_callback_proxy_test/BUILD.gn b/test/unittest/ability_connect_callback_proxy_test/BUILD.gn index aaba95f514e..97b20c8f4c8 100644 --- a/test/unittest/ability_connect_callback_proxy_test/BUILD.gn +++ b/test/unittest/ability_connect_callback_proxy_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("ability_connect_callback_proxy_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_connect_callback_stub_test/BUILD.gn b/test/unittest/ability_connect_callback_stub_test/BUILD.gn index 88a111f2f3d..b0ae2ee1be7 100644 --- a/test/unittest/ability_connect_callback_stub_test/BUILD.gn +++ b/test/unittest/ability_connect_callback_stub_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("ability_connect_callback_stub_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", @@ -107,7 +106,6 @@ ohos_unittest("ability_connect_callback_recipient_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_interceptor_third_test/BUILD.gn b/test/unittest/ability_interceptor_third_test/BUILD.gn index 301cbdc2713..20b50017b48 100644 --- a/test/unittest/ability_interceptor_third_test/BUILD.gn +++ b/test/unittest/ability_interceptor_third_test/BUILD.gn @@ -70,7 +70,6 @@ ohos_unittest("ability_interceptor_third_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", "libjpeg-turbo:turbojpeg", diff --git a/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn b/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn index 0661130d1c4..17c73c5df90 100644 --- a/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_fourth_test/BUILD.gn @@ -68,7 +68,6 @@ ohos_unittest("ability_manager_proxy_fourth_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_manager_proxy_second_test/BUILD.gn b/test/unittest/ability_manager_proxy_second_test/BUILD.gn index f7442776ac3..75dbc33eb9b 100644 --- a/test/unittest/ability_manager_proxy_second_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_second_test/BUILD.gn @@ -70,7 +70,6 @@ ohos_unittest("ability_manager_proxy_second_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn b/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn index 3a0641964b0..9ecdfbdcf59 100644 --- a/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_sixth_test/BUILD.gn @@ -69,7 +69,6 @@ ohos_unittest("ability_manager_proxy_sixth_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbeget_proxy", "ipc:ipc_core", diff --git a/test/unittest/ability_manager_proxy_test/BUILD.gn b/test/unittest/ability_manager_proxy_test/BUILD.gn index 2db162cc8e9..545058f7850 100644 --- a/test/unittest/ability_manager_proxy_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_test/BUILD.gn @@ -63,7 +63,6 @@ ohos_unittest("ability_manager_proxy_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_manager_proxy_third_test/BUILD.gn b/test/unittest/ability_manager_proxy_third_test/BUILD.gn index 62f6e2dac84..0d9b9756c8a 100644 --- a/test/unittest/ability_manager_proxy_third_test/BUILD.gn +++ b/test/unittest/ability_manager_proxy_third_test/BUILD.gn @@ -69,7 +69,6 @@ ohos_unittest("ability_manager_proxy_third_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_manager_service_account_test/BUILD.gn b/test/unittest/ability_manager_service_account_test/BUILD.gn index 50b623e31ee..6ea09b916dc 100644 --- a/test/unittest/ability_manager_service_account_test/BUILD.gn +++ b/test/unittest/ability_manager_service_account_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("ability_manager_service_account_test") { "dsoftbus:softbus_client", "ffrt:libffrt", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_manager_stub_second_test/BUILD.gn b/test/unittest/ability_manager_stub_second_test/BUILD.gn index cd5eaf9b129..6ffb3d3b6cc 100644 --- a/test/unittest/ability_manager_stub_second_test/BUILD.gn +++ b/test/unittest/ability_manager_stub_second_test/BUILD.gn @@ -67,7 +67,6 @@ ohos_unittest("ability_manager_stub_second_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_manager_stub_test/BUILD.gn b/test/unittest/ability_manager_stub_test/BUILD.gn index 0b24c73580e..d19b9aca67a 100644 --- a/test/unittest/ability_manager_stub_test/BUILD.gn +++ b/test/unittest/ability_manager_stub_test/BUILD.gn @@ -68,7 +68,6 @@ ohos_unittest("ability_manager_stub_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_record_first_test/BUILD.gn b/test/unittest/ability_record_first_test/BUILD.gn index 2c22b6f5faa..3e02e51406e 100644 --- a/test/unittest/ability_record_first_test/BUILD.gn +++ b/test/unittest/ability_record_first_test/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("ability_record_first_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", ] diff --git a/test/unittest/ability_record_second_test/BUILD.gn b/test/unittest/ability_record_second_test/BUILD.gn index 9d189c1da0a..ce8f5b8c37a 100644 --- a/test/unittest/ability_record_second_test/BUILD.gn +++ b/test/unittest/ability_record_second_test/BUILD.gn @@ -70,7 +70,6 @@ ohos_unittest("ability_record_second_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", ] diff --git a/test/unittest/ability_scheduler_proxy_test/BUILD.gn b/test/unittest/ability_scheduler_proxy_test/BUILD.gn index 108afe7a9d8..10df582bc88 100644 --- a/test/unittest/ability_scheduler_proxy_test/BUILD.gn +++ b/test/unittest/ability_scheduler_proxy_test/BUILD.gn @@ -64,7 +64,6 @@ ohos_unittest("ability_scheduler_proxy_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_scheduler_stub_second_test/BUILD.gn b/test/unittest/ability_scheduler_stub_second_test/BUILD.gn index 537ffd064a3..e37c4200bd6 100644 --- a/test/unittest/ability_scheduler_stub_second_test/BUILD.gn +++ b/test/unittest/ability_scheduler_stub_second_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("ability_scheduler_stub_second_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_scheduler_stub_test/BUILD.gn b/test/unittest/ability_scheduler_stub_test/BUILD.gn index f8ce56fce58..3d1f5b6668b 100644 --- a/test/unittest/ability_scheduler_stub_test/BUILD.gn +++ b/test/unittest/ability_scheduler_stub_test/BUILD.gn @@ -53,7 +53,6 @@ ohos_unittest("ability_scheduler_stub_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_service_start_test/BUILD.gn b/test/unittest/ability_service_start_test/BUILD.gn index 34addc58eb1..1aab058f227 100644 --- a/test/unittest/ability_service_start_test/BUILD.gn +++ b/test/unittest/ability_service_start_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("ability_service_start_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_token_proxy_test/BUILD.gn b/test/unittest/ability_token_proxy_test/BUILD.gn index 86ce0d5e405..cdc35627969 100644 --- a/test/unittest/ability_token_proxy_test/BUILD.gn +++ b/test/unittest/ability_token_proxy_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("ability_token_proxy_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/ability_token_stub_test/BUILD.gn b/test/unittest/ability_token_stub_test/BUILD.gn index 4087b427684..5b9cd72f170 100644 --- a/test/unittest/ability_token_stub_test/BUILD.gn +++ b/test/unittest/ability_token_stub_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("ability_token_stub_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbeget_proxy", "ipc:ipc_core", diff --git a/test/unittest/app_exit_reason_data_manager_new_test/BUILD.gn b/test/unittest/app_exit_reason_data_manager_new_test/BUILD.gn index 57b267c0cdf..5ba95e05926 100644 --- a/test/unittest/app_exit_reason_data_manager_new_test/BUILD.gn +++ b/test/unittest/app_exit_reason_data_manager_new_test/BUILD.gn @@ -50,7 +50,6 @@ ohos_unittest("app_exit_reason_data_manager_new_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "kv_store:distributeddata_inner", ] diff --git a/test/unittest/app_exit_reason_data_manager_second_test/BUILD.gn b/test/unittest/app_exit_reason_data_manager_second_test/BUILD.gn index 94ca4ac8e43..dd01857b0cd 100644 --- a/test/unittest/app_exit_reason_data_manager_second_test/BUILD.gn +++ b/test/unittest/app_exit_reason_data_manager_second_test/BUILD.gn @@ -50,7 +50,6 @@ ohos_unittest("app_exit_reason_data_manager_second_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "image_framework:image_native", "kv_store:distributeddata_inner", ] diff --git a/test/unittest/app_service_extension_context_test/BUILD.gn b/test/unittest/app_service_extension_context_test/BUILD.gn index d39c7285832..a136e622849 100644 --- a/test/unittest/app_service_extension_context_test/BUILD.gn +++ b/test/unittest/app_service_extension_context_test/BUILD.gn @@ -63,7 +63,6 @@ ohos_unittest("app_service_extension_context_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbeget_proxy", "ipc:ipc_core", diff --git a/test/unittest/background_task_observer_test/BUILD.gn b/test/unittest/background_task_observer_test/BUILD.gn index 245dc96dba7..811f34b56cc 100755 --- a/test/unittest/background_task_observer_test/BUILD.gn +++ b/test/unittest/background_task_observer_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("background_task_observer_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/call_record_test/BUILD.gn b/test/unittest/call_record_test/BUILD.gn index a9bfa99149f..09a97657e7f 100644 --- a/test/unittest/call_record_test/BUILD.gn +++ b/test/unittest/call_record_test/BUILD.gn @@ -50,7 +50,6 @@ ohos_unittest("call_record_test") { "ffrt:libffrt", "googletest:gmock_main", "hilog:libhilog", - "hisysevent:libhisysevent", "napi:ace_napi", "samgr:samgr_proxy", ] diff --git a/test/unittest/connection_observer_controller_test/BUILD.gn b/test/unittest/connection_observer_controller_test/BUILD.gn index 63acc745c2a..1081cdee709 100755 --- a/test/unittest/connection_observer_controller_test/BUILD.gn +++ b/test/unittest/connection_observer_controller_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("connection_observer_controller_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/connection_record_test/BUILD.gn b/test/unittest/connection_record_test/BUILD.gn index 91cfcd0dd45..2a719dc8873 100644 --- a/test/unittest/connection_record_test/BUILD.gn +++ b/test/unittest/connection_record_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("connection_record_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/connection_state_item_test/BUILD.gn b/test/unittest/connection_state_item_test/BUILD.gn index c51c0f6151b..bbd544e47e4 100755 --- a/test/unittest/connection_state_item_test/BUILD.gn +++ b/test/unittest/connection_state_item_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("connection_state_item_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/connection_state_manager_test/BUILD.gn b/test/unittest/connection_state_manager_test/BUILD.gn index 282ced1db3a..541c64c60cf 100755 --- a/test/unittest/connection_state_manager_test/BUILD.gn +++ b/test/unittest/connection_state_manager_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("connection_state_manager_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/data_ability_record_test/BUILD.gn b/test/unittest/data_ability_record_test/BUILD.gn index d4271655db6..bfeebed5295 100644 --- a/test/unittest/data_ability_record_test/BUILD.gn +++ b/test/unittest/data_ability_record_test/BUILD.gn @@ -68,7 +68,6 @@ ohos_unittest("data_ability_record_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/dlp_state_item_test/BUILD.gn b/test/unittest/dlp_state_item_test/BUILD.gn index 69e2d35eb63..2e7ec4196ac 100644 --- a/test/unittest/dlp_state_item_test/BUILD.gn +++ b/test/unittest/dlp_state_item_test/BUILD.gn @@ -56,7 +56,6 @@ ohos_unittest("dlp_state_item_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/ecological_rule_interceptor_test/BUILD.gn b/test/unittest/ecological_rule_interceptor_test/BUILD.gn index ddb74f38d78..3c93b4dd553 100644 --- a/test/unittest/ecological_rule_interceptor_test/BUILD.gn +++ b/test/unittest/ecological_rule_interceptor_test/BUILD.gn @@ -74,7 +74,6 @@ ohos_unittest("ecological_rule_interceptor_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", "libjpeg-turbo:turbojpeg", diff --git a/test/unittest/event_report_test/event_report_test.cpp b/test/unittest/event_report_test/event_report_test.cpp index 32eb8b2f81f..c6abe271008 100755 --- a/test/unittest/event_report_test/event_report_test.cpp +++ b/test/unittest/event_report_test/event_report_test.cpp @@ -83,7 +83,6 @@ HWTEST_F(EventReportTest, ConvertEventName_0100, TestSize.Level2) EXPECT_EQ(EventReport::ConvertEventName(EventName::DRAWN_COMPLETED), "DRAWN_COMPLETED"); EXPECT_EQ(EventReport::ConvertEventName(EventName::APP_STARTUP_TYPE), "APP_STARTUP_TYPE"); EXPECT_EQ(EventReport::ConvertEventName(EventName::PROCESS_START_FAILED), "PROCESS_START_FAILED"); - EXPECT_EQ(EventReport::ConvertEventName(EventName::APP_START_INTERCRPT_BY_EDM), "APP_START_INTERCRPT_BY_EDM"); // key behavior event EXPECT_EQ(EventReport::ConvertEventName(EventName::GRANT_URI_PERMISSION), "GRANT_URI_PERMISSION"); EXPECT_EQ(EventReport::ConvertEventName(EventName::FA_SHOW_ON_LOCK), "FA_SHOW_ON_LOCK"); @@ -160,21 +159,6 @@ HWTEST_F(EventReportTest, SendAppEvent_0400, TestSize.Level2) EventReport::SendAppEvent(eventName, type, eventInfo); } -/** - * @tc.name: SendAppEvent_0500 - * @tc.desc: Check SendAppEvent Test - * @tc.type: FUNC - * @tc.require: issueI6HXXS - */ -HWTEST_F(EventReportTest, SendAppEvent_0500, TestSize.Level2) -{ - EventName eventName = EventName::APP_START_INTERCRPT_BY_EDM; - EXPECT_EQ(EventReport::ConvertEventName(eventName), "APP_START_INTERCRPT_BY_EDM"); - HiSysEventType type = HiSysEventType::BEHAVIOR; - EventInfo eventInfo; - EventReport::SendAppEvent(eventName, type, eventInfo); -} - /** * @tc.name: SendAbilityEvent_0100 * @tc.desc: Check SendAbilityEvent Test diff --git a/test/unittest/exit_info_data_manager_test/BUILD.gn b/test/unittest/exit_info_data_manager_test/BUILD.gn index b686fe9efa1..d6b9f45257b 100644 --- a/test/unittest/exit_info_data_manager_test/BUILD.gn +++ b/test/unittest/exit_info_data_manager_test/BUILD.gn @@ -71,7 +71,6 @@ ohos_unittest("exit_info_data_manager_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/exit_reason_test/BUILD.gn b/test/unittest/exit_reason_test/BUILD.gn index 9ffa2f0d7e4..c2a416e1a77 100644 --- a/test/unittest/exit_reason_test/BUILD.gn +++ b/test/unittest/exit_reason_test/BUILD.gn @@ -71,7 +71,6 @@ ohos_unittest("exit_reason_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/extension_record_factory_test/BUILD.gn b/test/unittest/extension_record_factory_test/BUILD.gn index f88333ffaa1..1b43641f624 100644 --- a/test/unittest/extension_record_factory_test/BUILD.gn +++ b/test/unittest/extension_record_factory_test/BUILD.gn @@ -90,7 +90,6 @@ ohos_unittest("extension_record_factory_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "i18n:intl_util", "init:libbegetutil", diff --git a/test/unittest/lifecycle_deal_test/BUILD.gn b/test/unittest/lifecycle_deal_test/BUILD.gn index f0fc9b3571b..feaa2648d4b 100644 --- a/test/unittest/lifecycle_deal_test/BUILD.gn +++ b/test/unittest/lifecycle_deal_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("lifecycle_deal_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/mission_data_storage_test/BUILD.gn b/test/unittest/mission_data_storage_test/BUILD.gn index 967dd5bd34f..f2c36458eae 100755 --- a/test/unittest/mission_data_storage_test/BUILD.gn +++ b/test/unittest/mission_data_storage_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("mission_data_storage_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/mission_info_mgr_second_test/BUILD.gn b/test/unittest/mission_info_mgr_second_test/BUILD.gn index db0c15905d5..a1291231d5e 100644 --- a/test/unittest/mission_info_mgr_second_test/BUILD.gn +++ b/test/unittest/mission_info_mgr_second_test/BUILD.gn @@ -61,7 +61,6 @@ ohos_unittest("mission_info_mgr_second_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/mission_info_mgr_test/BUILD.gn b/test/unittest/mission_info_mgr_test/BUILD.gn index 3d393994ddf..8735ba0398c 100755 --- a/test/unittest/mission_info_mgr_test/BUILD.gn +++ b/test/unittest/mission_info_mgr_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("mission_info_mgr_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/mission_info_test/BUILD.gn b/test/unittest/mission_info_test/BUILD.gn index e61b86f6892..1da5092dbe5 100755 --- a/test/unittest/mission_info_test/BUILD.gn +++ b/test/unittest/mission_info_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("mission_info_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/mission_list_manager_test/BUILD.gn b/test/unittest/mission_list_manager_test/BUILD.gn index 7fd7a82a4cf..db23668ea1c 100644 --- a/test/unittest/mission_list_manager_test/BUILD.gn +++ b/test/unittest/mission_list_manager_test/BUILD.gn @@ -65,7 +65,6 @@ ohos_unittest("mission_list_manager_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/mission_list_test/BUILD.gn b/test/unittest/mission_list_test/BUILD.gn index 00cbd596216..7c72f9189e3 100644 --- a/test/unittest/mission_list_test/BUILD.gn +++ b/test/unittest/mission_list_test/BUILD.gn @@ -52,7 +52,6 @@ ohos_unittest("mission_list_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/mission_listener_proxy_test/BUILD.gn b/test/unittest/mission_listener_proxy_test/BUILD.gn index 651aed10570..1a5d686b24c 100755 --- a/test/unittest/mission_listener_proxy_test/BUILD.gn +++ b/test/unittest/mission_listener_proxy_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("mission_listener_proxy_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/mission_listener_test/BUILD.gn b/test/unittest/mission_listener_test/BUILD.gn index 67f9dbff8d2..87a9b2443f8 100644 --- a/test/unittest/mission_listener_test/BUILD.gn +++ b/test/unittest/mission_listener_test/BUILD.gn @@ -62,7 +62,6 @@ ohos_unittest("mission_listener_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/mission_test/BUILD.gn b/test/unittest/mission_test/BUILD.gn index 514ce321ca7..ab1c9dc9b80 100644 --- a/test/unittest/mission_test/BUILD.gn +++ b/test/unittest/mission_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("mission_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/pending_want_key_test/BUILD.gn b/test/unittest/pending_want_key_test/BUILD.gn index af851d27df4..67e19197850 100644 --- a/test/unittest/pending_want_key_test/BUILD.gn +++ b/test/unittest/pending_want_key_test/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("pending_want_key_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", ] diff --git a/test/unittest/pending_want_manager_test/BUILD.gn b/test/unittest/pending_want_manager_test/BUILD.gn index 0e5be35881f..258b7d88596 100644 --- a/test/unittest/pending_want_manager_test/BUILD.gn +++ b/test/unittest/pending_want_manager_test/BUILD.gn @@ -69,7 +69,6 @@ ohos_unittest("pending_want_manager_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/recovery_info_timer_test/BUILD.gn b/test/unittest/recovery_info_timer_test/BUILD.gn index fcdb83f2e3d..a481c370d22 100644 --- a/test/unittest/recovery_info_timer_test/BUILD.gn +++ b/test/unittest/recovery_info_timer_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("recovery_info_timer_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "kv_store:distributeddata_inner", "napi:ace_napi", diff --git a/test/unittest/remote_mission_listener_proxy_test/BUILD.gn b/test/unittest/remote_mission_listener_proxy_test/BUILD.gn index 26870dc9b04..aff0e078088 100755 --- a/test/unittest/remote_mission_listener_proxy_test/BUILD.gn +++ b/test/unittest/remote_mission_listener_proxy_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("remote_mission_listener_proxy_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/restart_app_manager_test/BUILD.gn b/test/unittest/restart_app_manager_test/BUILD.gn index 1fd7c1ed34c..05127dcf78c 100644 --- a/test/unittest/restart_app_manager_test/BUILD.gn +++ b/test/unittest/restart_app_manager_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("restart_app_manager_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "kv_store:distributeddata_inner", "napi:ace_napi", diff --git a/test/unittest/sender_info_test/BUILD.gn b/test/unittest/sender_info_test/BUILD.gn index 422b02767b8..d20919b99cd 100644 --- a/test/unittest/sender_info_test/BUILD.gn +++ b/test/unittest/sender_info_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("sender_info_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/service_extension_context_test/BUILD.gn b/test/unittest/service_extension_context_test/BUILD.gn index b6a7c73efc1..6c412aa70cc 100644 --- a/test/unittest/service_extension_context_test/BUILD.gn +++ b/test/unittest/service_extension_context_test/BUILD.gn @@ -63,7 +63,6 @@ ohos_unittest("service_extension_context_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "init:libbeget_proxy", "ipc:ipc_core", diff --git a/test/unittest/services/ability_util_test/BUILD.gn b/test/unittest/services/ability_util_test/BUILD.gn index c429ffb6a8b..606c4a3bd64 100644 --- a/test/unittest/services/ability_util_test/BUILD.gn +++ b/test/unittest/services/ability_util_test/BUILD.gn @@ -39,7 +39,6 @@ ohos_unittest("ability_util_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "image_framework:image_native", ] diff --git a/test/unittest/stop_user_callback_proxy_test/BUILD.gn b/test/unittest/stop_user_callback_proxy_test/BUILD.gn index bf90b09291f..bb2e7a4a561 100755 --- a/test/unittest/stop_user_callback_proxy_test/BUILD.gn +++ b/test/unittest/stop_user_callback_proxy_test/BUILD.gn @@ -53,7 +53,6 @@ ohos_unittest("stop_user_callback_proxy_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/stop_user_callback_stub_test/BUILD.gn b/test/unittest/stop_user_callback_stub_test/BUILD.gn index 3f8036ff4f2..1e77ad3d5a4 100644 --- a/test/unittest/stop_user_callback_stub_test/BUILD.gn +++ b/test/unittest/stop_user_callback_stub_test/BUILD.gn @@ -57,7 +57,6 @@ ohos_unittest("stop_user_callback_stub_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "ipc:ipc_core", "napi:ace_napi", diff --git a/test/unittest/task_data_persistence_mgr_test/BUILD.gn b/test/unittest/task_data_persistence_mgr_test/BUILD.gn index 305be861580..f136607c27b 100755 --- a/test/unittest/task_data_persistence_mgr_test/BUILD.gn +++ b/test/unittest/task_data_persistence_mgr_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("task_data_persistence_mgr_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/ui_extension_record_factory_test/BUILD.gn b/test/unittest/ui_extension_record_factory_test/BUILD.gn index d149462ff78..62f277cbd89 100644 --- a/test/unittest/ui_extension_record_factory_test/BUILD.gn +++ b/test/unittest/ui_extension_record_factory_test/BUILD.gn @@ -94,7 +94,6 @@ ohos_unittest("ui_extension_record_factory_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "init:libbeget_proxy", "init:libbegetutil", "ipc:ipc_core", diff --git a/test/unittest/uri_utils_test/BUILD.gn b/test/unittest/uri_utils_test/BUILD.gn index a837748a98e..055bb35e132 100644 --- a/test/unittest/uri_utils_test/BUILD.gn +++ b/test/unittest/uri_utils_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("uri_utils_test") { "c_utils:utils", "ffrt:libffrt", "hilog:libhilog", - "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", "jsoncpp:jsoncpp", diff --git a/test/unittest/user_event_handler_test/BUILD.gn b/test/unittest/user_event_handler_test/BUILD.gn index 04e30ed205f..bf7e0fee8b3 100755 --- a/test/unittest/user_event_handler_test/BUILD.gn +++ b/test/unittest/user_event_handler_test/BUILD.gn @@ -53,7 +53,6 @@ ohos_unittest("user_event_handler_test") { "ffrt:libffrt", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/want_receiver_proxy_test/BUILD.gn b/test/unittest/want_receiver_proxy_test/BUILD.gn index e8df9713354..4b2cdb9320a 100644 --- a/test/unittest/want_receiver_proxy_test/BUILD.gn +++ b/test/unittest/want_receiver_proxy_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("want_receiver_proxy_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/want_receiver_stub_test/BUILD.gn b/test/unittest/want_receiver_stub_test/BUILD.gn index 41d773a256d..efd7739e417 100644 --- a/test/unittest/want_receiver_stub_test/BUILD.gn +++ b/test/unittest/want_receiver_stub_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("want_receiver_stub_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/want_sender_info_test/BUILD.gn b/test/unittest/want_sender_info_test/BUILD.gn index 2ae36e4a825..dad9d5e68cb 100644 --- a/test/unittest/want_sender_info_test/BUILD.gn +++ b/test/unittest/want_sender_info_test/BUILD.gn @@ -55,7 +55,6 @@ ohos_unittest("want_sender_info_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/want_sender_proxy_test/BUILD.gn b/test/unittest/want_sender_proxy_test/BUILD.gn index 99957a32989..889e8ca2fdd 100644 --- a/test/unittest/want_sender_proxy_test/BUILD.gn +++ b/test/unittest/want_sender_proxy_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("want_sender_proxy_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/want_sender_stub_test/BUILD.gn b/test/unittest/want_sender_stub_test/BUILD.gn index 28d9a340d24..52e4c0acd93 100644 --- a/test/unittest/want_sender_stub_test/BUILD.gn +++ b/test/unittest/want_sender_stub_test/BUILD.gn @@ -60,7 +60,6 @@ ohos_unittest("want_sender_stub_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/test/unittest/wants_info_test/BUILD.gn b/test/unittest/wants_info_test/BUILD.gn index e85bedc8055..13de658d221 100644 --- a/test/unittest/wants_info_test/BUILD.gn +++ b/test/unittest/wants_info_test/BUILD.gn @@ -51,7 +51,6 @@ ohos_unittest("wants_info_test") { "googletest:gmock_main", "googletest:gtest_main", "hilog:libhilog", - "hisysevent:libhisysevent", "ipc:ipc_core", "napi:ace_napi", "samgr:samgr_proxy", -- Gitee