diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 686d8b0237..abbdd894c4 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -119,7 +119,6 @@ ohos_shared_library("abilityms") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", - "input:libmmi-client", "ipc:ipc_core", "relational_store:native_dataability", "relational_store:native_rdb", @@ -146,6 +145,7 @@ ohos_shared_library("abilityms") { [ "${global_path}/resource_management/frameworks/resmgr:global_resmgr" ] external_deps += [ "i18n:intl_util", + "input:libmmi-client", "multimedia_image_standard:image_native", "window_manager:libdm", "window_manager:libwm", diff --git a/services/abilitymgr/abilitymgr.gni b/services/abilitymgr/abilitymgr.gni index 8dd366eac1..a16550c1ba 100644 --- a/services/abilitymgr/abilitymgr.gni +++ b/services/abilitymgr/abilitymgr.gni @@ -26,7 +26,6 @@ abilityms_files = [ "src/ability_token_stub.cpp", "src/app_no_response_disposer.cpp", "src/app_scheduler.cpp", - "src/application_anr_listener.cpp", "src/connection_record.cpp", "src/data_ability_caller_recipient.cpp", "src/data_ability_manager.cpp", @@ -89,6 +88,7 @@ abilityms_files = [ if (ability_runtime_graphics) { abilityms_files += [ + "src/application_anr_listener.cpp", "src/implicit_start_processor.cpp", "src/system_dialog_scheduler.cpp", ] diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index 90d58de6bc..e12371460f 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -29,7 +29,6 @@ #include "ability_manager_stub.h" #include "app_no_response_disposer.h" #include "app_scheduler.h" -#include "application_anr_listener.h" #ifdef BGTASKMGR_CONTINUOUS_TASK_ENABLE #include "background_task_observer.h" #endif @@ -48,6 +47,7 @@ #include "user_controller.h" #include "resident_process_manager.h" #ifdef SUPPORT_GRAPHICS +#include "application_anr_listener.h" #include "implicit_start_processor.h" #include "system_dialog_scheduler.h" #endif @@ -1054,9 +1054,9 @@ private: int32_t ShowPickerDialog(const Want& want, int32_t userId); std::shared_ptr implicitStartProcessor_; sptr wmsHandler_; + std::shared_ptr anrListener_; #endif std::shared_ptr anrDisposer_; - std::shared_ptr anrListener_; }; } // namespace AAFwk } // namespace OHOS diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index efe9be1d71..060dc39483 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -40,7 +40,6 @@ #include "hilog_wrapper.h" #include "if_system_ability_manager.h" #include "in_process_call_wrapper.h" -#include "input_manager.h" #include "ipc_skeleton.h" #include "iservice_registry.h" #include "itest_observer.h" @@ -60,6 +59,7 @@ #ifdef SUPPORT_GRAPHICS #include "display_manager.h" +#include "input_manager.h" #include "png.h" #include "ui_service_mgr_client.h" #endif @@ -242,6 +242,8 @@ bool AbilityManagerService::Init() #ifdef SUPPORT_GRAPHICS DelayedSingleton::GetInstance()->SetDeviceType(amsConfigResolver_->GetDeviceType()); implicitStartProcessor_ = std::make_shared(); + anrListener_ = std::make_shared(); + MMI::InputManager::GetInstance()->SetAnrObserver(anrListener_); #endif anrDisposer_ = std::make_shared(amsConfigResolver_->GetANRTimeOutTime()); @@ -250,9 +252,6 @@ bool AbilityManagerService::Init() SubscribeBackgroundTask(); - anrListener_ = std::make_shared(); - MMI::InputManager::GetInstance()->SetAnrObserver(anrListener_); - HILOG_INFO("Init success."); return true; } diff --git a/test/fuzztest/abilitymanager_fuzzer/BUILD.gn b/test/fuzztest/abilitymanager_fuzzer/BUILD.gn index 801b1c94f3..9e9cf718a2 100644 --- a/test/fuzztest/abilitymanager_fuzzer/BUILD.gn +++ b/test/fuzztest/abilitymanager_fuzzer/BUILD.gn @@ -47,12 +47,15 @@ ohos_fuzztest("AbilityManagerFuzzTest") { "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "common_event_service:cesfwk_innerkits", - "input:libmmi-client", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "utils_base:utils", ] + + if (ability_runtime_graphics) { + external_deps += [ "input:libmmi-client" ] + } } ############################################################################### diff --git a/test/moduletest/ability_record_test/BUILD.gn b/test/moduletest/ability_record_test/BUILD.gn index fe6eb5a385..7c485a9b9a 100644 --- a/test/moduletest/ability_record_test/BUILD.gn +++ b/test/moduletest/ability_record_test/BUILD.gn @@ -81,7 +81,6 @@ ohos_moduletest("AbilityRecordModuleTest") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", - "input:libmmi-client", "ipc:ipc_core", "relational_store:native_appdatafwk", "relational_store:native_dataability", @@ -98,7 +97,10 @@ ohos_moduletest("AbilityRecordModuleTest") { } if (ability_runtime_graphics) { - external_deps += [ "window_manager:libdm" ] + external_deps += [ + "input:libmmi-client", + "window_manager:libdm", + ] } } diff --git a/test/moduletest/ability_timeout_module_test/BUILD.gn b/test/moduletest/ability_timeout_module_test/BUILD.gn index b01d8cfcdb..d7384b0231 100644 --- a/test/moduletest/ability_timeout_module_test/BUILD.gn +++ b/test/moduletest/ability_timeout_module_test/BUILD.gn @@ -84,7 +84,6 @@ ohos_moduletest("ability_timeout_module_test") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", - "input:libmmi-client", "ipc:ipc_core", "relational_store:native_appdatafwk", "relational_store:native_dataability", @@ -101,7 +100,10 @@ ohos_moduletest("ability_timeout_module_test") { } if (ability_runtime_graphics) { - external_deps += [ "window_manager:libdm" ] + external_deps += [ + "input:libmmi-client", + "window_manager:libdm", + ] } } diff --git a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn index 19e91eb31a..306804dc0a 100644 --- a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn +++ b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn @@ -83,7 +83,6 @@ ohos_moduletest("specified_ability_service_test") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", - "input:libmmi-client", "ipc:ipc_core", "relational_store:native_appdatafwk", "relational_store:native_dataability", @@ -100,7 +99,10 @@ ohos_moduletest("specified_ability_service_test") { } if (ability_runtime_graphics) { - external_deps += [ "window_manager:libdm" ] + external_deps += [ + "input:libmmi-client", + "window_manager:libdm", + ] } } diff --git a/test/moduletest/on_new_want_module_test/BUILD.gn b/test/moduletest/on_new_want_module_test/BUILD.gn index 16b595049e..3b1dc389e8 100644 --- a/test/moduletest/on_new_want_module_test/BUILD.gn +++ b/test/moduletest/on_new_want_module_test/BUILD.gn @@ -79,7 +79,6 @@ ohos_moduletest("on_new_want_module_test") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", - "input:libmmi-client", "ipc:ipc_core", "relational_store:native_appdatafwk", "relational_store:native_dataability", @@ -96,7 +95,10 @@ ohos_moduletest("on_new_want_module_test") { } if (ability_runtime_graphics) { - external_deps += [ "window_manager:libdm" ] + external_deps += [ + "input:libmmi-client", + "window_manager:libdm", + ] } } diff --git a/test/moduletest/running_infos_module_test/BUILD.gn b/test/moduletest/running_infos_module_test/BUILD.gn index 3664aff9b6..b02ea7a9fb 100644 --- a/test/moduletest/running_infos_module_test/BUILD.gn +++ b/test/moduletest/running_infos_module_test/BUILD.gn @@ -84,7 +84,6 @@ ohos_moduletest("running_infos_module_test") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", - "input:libmmi-client", "ipc:ipc_core", "relational_store:native_appdatafwk", "relational_store:native_dataability", @@ -101,7 +100,10 @@ ohos_moduletest("running_infos_module_test") { } if (ability_runtime_graphics) { - external_deps += [ "window_manager:libdm" ] + external_deps += [ + "input:libmmi-client", + "window_manager:libdm", + ] } } diff --git a/test/moduletest/start_ability_implicit_module_test/BUILD.gn b/test/moduletest/start_ability_implicit_module_test/BUILD.gn index fb6a6acc44..5c2accfa97 100644 --- a/test/moduletest/start_ability_implicit_module_test/BUILD.gn +++ b/test/moduletest/start_ability_implicit_module_test/BUILD.gn @@ -88,7 +88,6 @@ ohos_moduletest("start_ability_implicit_module_test") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", - "input:libmmi-client", "ipc:ipc_core", "relational_store:native_appdatafwk", "relational_store:native_dataability", @@ -105,7 +104,10 @@ ohos_moduletest("start_ability_implicit_module_test") { } if (ability_runtime_graphics) { - external_deps += [ "window_manager:libdm" ] + external_deps += [ + "input:libmmi-client", + "window_manager:libdm", + ] } } diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 05d6360d9a..8fd9096251 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -113,7 +113,6 @@ ohos_source_set("abilityms_test_source") { "${ability_runtime_services_path}/abilitymgr/src/ability_token_stub.cpp", "${ability_runtime_services_path}/abilitymgr/src/ams_configuration_parameter.cpp", "${ability_runtime_services_path}/abilitymgr/src/app_no_response_disposer.cpp", - "${ability_runtime_services_path}/abilitymgr/src/application_anr_listener.cpp", "${ability_runtime_services_path}/abilitymgr/src/atomic_service_status_callback.cpp", "${ability_runtime_services_path}/abilitymgr/src/atomic_service_status_callback_proxy.cpp", "${ability_runtime_services_path}/abilitymgr/src/atomic_service_status_callback_stub.cpp", @@ -190,7 +189,6 @@ ohos_source_set("abilityms_test_source") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", - "input:libmmi-client", "ipc:ipc_core", "relational_store:native_appdatafwk", "relational_store:native_dataability", @@ -205,6 +203,7 @@ ohos_source_set("abilityms_test_source") { if (ability_runtime_graphics) { sources += [ + "${ability_runtime_services_path}/abilitymgr/src/application_anr_listener.cpp", "${ability_runtime_services_path}/abilitymgr/src/image_info.cpp", "${ability_runtime_services_path}/abilitymgr/src/implicit_start_processor.cpp", "${ability_runtime_services_path}/abilitymgr/src/inner_mission_info.cpp", @@ -228,7 +227,10 @@ ohos_source_set("abilityms_test_source") { "${multimedia_path}/interfaces/innerkits:image_native", "//third_party/icu/icu4c:shared_icuuc", ] - external_deps += [ "window_manager:libdm" ] + external_deps += [ + "input:libmmi-client", + "window_manager:libdm", + ] } subsystem_name = "ability"