refactor: move utils to utils folder

Signed-off-by: yangxuguang-huawei <yangxuguang3@huawei.com>

frameworks/js/napi/wantagent/BUILD.gn

@@ -18,6 +18,7 @@ ohos_shared_library("wantagent") {
   include_dirs = [
     "${ability_runtime_services_path}/common/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "./",
   ]

frameworks/js/napi/wantagent/ability_want_agent/BUILD.gn

@@ -18,6 +18,7 @@ ohos_shared_library("wantagent_napi") {
   include_dirs = [
     "${ability_runtime_services_path}/common/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "./",
     "../",

frameworks/native/ability/native/BUILD.gn

@@ -34,6 +34,7 @@ config("ability_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_innerkits_path}/uri/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_innerkits_path}/ability_manager/include/continuation",
@@ -130,6 +131,7 @@ ohos_shared_library("abilitykit_utils") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_innerkits_path}/wantagent/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
   ]
@@ -206,6 +208,7 @@ ohos_shared_library("configuration_helper") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_innerkits_path}/wantagent/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
   ]
@@ -570,6 +573,7 @@ config("uiability_config") {
     "${ability_runtime_path}/interfaces/kits/native/ability/native/recovery/",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
 
@@ -1057,6 +1061,7 @@ ohos_shared_library("ui_service_extension_module") {
     "${ability_runtime_path}/interfaces/kits/native/ability/native/recovery/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_innerkits_path}/uri/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/ability_manager/include/continuation",
     "${ability_runtime_innerkits_path}/ability_manager/include",
@@ -1699,6 +1704,7 @@ config("embedded_ui_extension_module_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_innerkits_path}/uri/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",

frameworks/native/appkit/BUILD.gn

@@ -88,6 +88,7 @@ ohos_shared_library("appkit_native") {
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/recovery",
     "${ability_runtime_path}/utils/global/time/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_napi_path}/inner/napi_common",
     "${ability_runtime_utils_path}/global/constant",

interfaces/inner_api/ability_manager/BUILD.gn

@@ -384,6 +384,7 @@ ohos_shared_library("ability_connect_callback_stub") {
   include_dirs = [
     "include/",
     "${ability_base_kits_path}/want/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
   ]

interfaces/inner_api/extension_manager/BUILD.gn

@@ -29,6 +29,7 @@ config("extension_manager_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
   ]

interfaces/inner_api/wantagent/BUILD.gn

@@ -33,6 +33,7 @@ config("wantagent_innerkits_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_innerkits_path}/wantagent/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",

services/abilitymgr/BUILD.gn

@@ -256,6 +256,7 @@ ohos_shared_library("wantagent_manager") {
   branch_protector_ret = "pac_ret"
   include_dirs = [
     "${ability_runtime_services_path}/abilitymgr/data_ability/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_services_path}/common/include",
@@ -348,6 +349,7 @@ ohos_shared_library("mission_list") {
     "${ability_runtime_path}/interfaces/kits/native/ability/native",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
     "${ability_runtime_services_path}/abilitymgr/data_ability/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/abilitymgr/include/mission",
     "${ability_runtime_services_path}/common/include",

services/abilitymgr/abilitymgr.gni

@@ -52,7 +52,6 @@ abilityms_files = [
   "src/pending_want_common_event.cpp",
   "src/restart_app_manager.cpp",
   "src/ams_configuration_parameter.cpp",
-  "src/insight_intent_utils.cpp",
   "src/insight_intent_profile.cpp",
   "src/recovery_info_timer.cpp",
   "src/modal_system_dialog/modal_system_dialog_ui_extension.cpp",
@@ -66,13 +65,11 @@ abilityms_files = [
   "src/interceptor/extension_control_interceptor.cpp",
   "src/interceptor/screen_unlock_interceptor.cpp",
   "src/interceptor/start_other_app_interceptor.cpp",
-  "src/uri_utils.cpp",
   "src/window_focus_changed_listener.cpp",
 
   # start ability handler
   "src/start_ability_handler.cpp",
   "src/start_ability_handler/start_ability_sandbox_savefile.cpp",
-  "src/start_ability_utils.cpp",
 
   # new ability manager service here
   "src/extension_record_manager.cpp",
@@ -119,7 +116,6 @@ abilityms_files = [
   "src/resident_process/resident_process_manager.cpp",
 
   "src/ability_bundle_event_callback.cpp",
-  "src/ability_event_util.cpp",
 
   "src/app_exit_reason_data_manager.cpp",
 
@@ -132,18 +128,22 @@ abilityms_files = [
   "src/ability_manager_event_subscriber.cpp",
 
   #utils
-  "src/utils/window_options_utils.cpp",
-  "src/utils/want_utils.cpp",
-  "src/utils/state_utils.cpp",
-  "src/utils/extension_permissions_util.cpp",
-  "src/utils/app_mgr_util.cpp",
-  "src/utils/main_element_utils.cpp",
-  "src/utils/dump_utils.cpp",
+  "src/utils/ability_event_util.cpp",
   "src/utils/ability_permission_util.cpp",
+  "src/utils/app_mgr_util.cpp",
+  "src/utils/dump_utils.cpp",
+  "src/utils/extension_permissions_util.cpp",
+  "src/utils/insight_intent_utils.cpp",
+  "src/utils/main_element_utils.cpp",
   "src/utils/modal_system_dialog_util.cpp",
   "src/utils/multi_app_utils.cpp",
   "src/utils/multi_instance_utils.cpp",
+  "src/utils/start_ability_utils.cpp",
+  "src/utils/state_utils.cpp",
   "src/utils/update_caller_info_util.cpp",
+  "src/utils/uri_utils.cpp",
+  "src/utils/want_utils.cpp",
+  "src/utils/window_options_utils.cpp",
 ]
 
 if (ability_runtime_graphics) {

services/abilitymgr/libabilityms.map

@@ -19,8 +19,11 @@
       *AbilityConnectionStub*;
       *AbilityConnectManager*;
       *AbilityEventHandler*;
+      *AbilityEventUtil*;
       *AbilityFirstFrameStateObserverManager*;
       *AbilityInterceptorExecuter*;
+      *AbilityJumpInterceptor*;
+      *AbilityManagerProxy*;
       *AbilityManagerService*;
       *AbilityManagerStub*;
       *AbilityPermissionUtil*;
@@ -31,6 +34,7 @@
       *AmsConfigurationParameter*;
       *AppExitReasonDataManager*;
       *ApplicationAnrListener*;
+      *AppMgrUtil*;
       *AppScheduler*;
       *AtomicServiceStatusCallback*;
       *BackgroundTaskObserver*;
@@ -38,6 +42,7 @@
       *CallContainer*;
       *CallerInfo*;
       *CallerRecord*;
+      *CallRecord*;
       *ConnectionObserverController*;
       *ConnectionRecord*;
       *ConnectionStateItem*;
@@ -45,14 +50,17 @@
       *ConnectionManagerClient*;
       *ControlInterceptor*;
       *CrowdTestInterceptor*;
+      *DeepLinkReserveConfig*;
       *DisposedRuleInterceptor*;
+      *DumpUtils*;
       *EcologicalRuleInterceptor*;
-      *AbilityJumpInterceptor*;
+      *ExtensionPermissionsUtil*;
       *DataAbilityManager*;
       *FreeInstallManager*;
       *FreeInstallObserverManager*;
       *ImplicitStartProcessor*;
       *InnerMissionInfo*;
+      *InsightIntentUtils*;
       *LaunchParam*;
       *LifeCycleStateInfo*;
       *Mission*;
@@ -63,29 +71,34 @@
       *MissionListenerStub*;
       *MissionListManager*;
       *MissionSnapshot*;
+      *ModalSystemDialogUtil*;
+      *MultiAppUtils*;
       *MultiInstanceUtils*;
       *PendingWantKey*;
       *PendingWantManager*;
       *PendingWantRecord*;
       *ResidentProcessManager*;
+      *StartAbilityUtils*;
       *StartOptions*;
+      *StateUtils*;
       *SystemDialogScheduler*;
       *TaskDataPersistenceMgr*;
       *Token*;
+      *UpdateCallerInfoUtil*;
+      *UriUtils*;
       *UserController*;
       *UnlockScreenManager*;
       *WantSenderInfo*;
       *SenderInfo*;
-      *AbilityManagerProxy*;
       *ExtensionRunningInfo*;
       *UserCallbackStub*;
       *UserItem*;
       *WantReceiverStub*;
-      *CallRecord*;
       *WantReceiverProxy*;
       *WantSenderProxy*;
       *WantSenderStub*;
-      *DeepLinkReserveConfig*;
+      *WantUtils*;
+      *WindowOptionsUtils*;
     };
   local:
     *;

test/fuzztest/abilityappfreezemanager_fuzzer/BUILD.gn

@@ -23,6 +23,7 @@ ohos_fuzztest("AbilityAppFreezeManagerFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/abilityappfreezemanager_fuzzer"
   include_dirs = [
     "${ability_runtime_services_path}/appmgr/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appdfr/include",
     "${ability_runtime_path}/utils/global/freeze/include",

test/fuzztest/abilityappmgrapprunningmanager_fuzzer/BUILD.gn

@@ -29,6 +29,7 @@ ohos_fuzztest("AbilityAppMgrAppRunningManagerFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appmgr/include",
     "${ability_runtime_services_path}/common/include",

test/fuzztest/abilityappmgrpagestatedata_fuzzer/BUILD.gn

@@ -22,6 +22,7 @@ ohos_fuzztest("AbilityAppMgrPageStateDataFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/abilityappmgrpagestatedata_fuzzer"
   include_dirs = [
     "${ability_runtime_services_path}/appmgr/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
 

test/fuzztest/abilityappmgrrenderstatedata_fuzzer/BUILD.gn

@@ -21,6 +21,7 @@ ohos_fuzztest("AbilityAppMgrRenderStateDataFuzzTest") {
   fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilityappmgrrenderstatedata_fuzzer"
   include_dirs = [
     "${ability_runtime_services_path}/appmgr/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
 

test/fuzztest/abilityappmgrrenderstateobservermanager_fuzzer/BUILD.gn

@@ -29,6 +29,7 @@ ohos_fuzztest("AbilityAppMgrRenderStateObserverManagerFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appmgr/include",
     "${ability_runtime_services_path}/common/include",

test/fuzztest/abilityappmgrrunningmultiinfo_fuzzer/BUILD.gn

@@ -21,6 +21,7 @@ ohos_fuzztest("AbilityAppMgrRunningMultiInfoFuzzTest") {
   fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilityappmgrrunningmultiinfo_fuzzer"
   include_dirs = [
     "${ability_runtime_services_path}/appmgr/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
 

test/fuzztest/abilityautostartupclient_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("AbilityAutoStartupClientFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/abilityautostartupclient_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilityautostartupdatamanager_fuzzer/BUILD.gn

@@ -25,6 +25,7 @@ ohos_fuzztest("AbilityAutoStartupDataManagerFuzzTest") {
   fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilityautostartupdatamanager_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilitybackgroundconnection_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("AbilityBackgroundConnectionFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/abilitybackgroundconnection_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilitydebugdeal_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("AbilityDebugDealFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/abilitydebugdeal_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
   ]

test/fuzztest/abilityeventutil_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("AbilityEventUtilFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/abilityeventutil_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -35,7 +36,7 @@ ohos_fuzztest("AbilityEventUtilFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "abilityeventutil_fuzzer.cpp",
   ]
 

test/fuzztest/abilityfirstframestateobservermanager_fuzzer/BUILD.gn

@@ -25,6 +25,7 @@ ohos_fuzztest("AbilityFirstFrameStateObserverManagerFuzzTest") {
   fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilityfirstframestateobservermanager_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
   ]

test/fuzztest/abilityframeworkscjenvironment_fuzzer/BUILD.gn

@@ -34,6 +34,7 @@ ohos_fuzztest("AbilityFrameworksCjEnvironmentFuzzTest") {
     "${ability_base_kits_path}/extractortool/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",

test/fuzztest/abilityframeworksnativejsworker_fuzzer/BUILD.gn

@@ -34,6 +34,7 @@ ohos_fuzztest("AbilityFrameworksNativeJsWorkerFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "//third_party/zlib/contrib/minizip",
     "//third_party/zlib",

test/fuzztest/abilityframeworksnativeohosjsenvlogger_fuzzer/BUILD.gn

@@ -36,6 +36,7 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "//third_party/zlib/contrib/minizip",
     "//third_party/zlib",
@@ -49,7 +50,7 @@ ohos_fuzztest("AbilityFrameworksNativeOhosJsEnvLoggerFuzzTest") {
   ]
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "abilityframeworksnativeohosjsenvlogger_fuzzer.cpp",
   ]

test/fuzztest/abilitymanagereventsubscriber_fuzzer/BUILD.gn

@@ -25,6 +25,7 @@ ohos_fuzztest("AbilityManagerEventSubscriberFuzzTest") {
   fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilitymanagereventsubscriber_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilitymgrabilitymanagerstub_fuzzer/BUILD.gn

@@ -27,6 +27,7 @@ ohos_fuzztest("AbilityMgrAbilityManagerStubFuzzTest") {
   include_dirs = [
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
     "${ability_runtime_path}/interfaces/kits/native/session_info/include",

test/fuzztest/abilitymgrappexitreasonhelper_fuzzer/BUILD.gn

@@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrAppExitReasonHelperFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/abilitymgr/include/scene_board",
     "${ability_runtime_services_path}/abilitymgr/include/mission",

test/fuzztest/abilitymgrcontrolinterceptor_fuzzer/BUILD.gn

@@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -39,7 +40,7 @@ ohos_fuzztest("AbilityMgrControlInterceptorFuzzTest") {
   ]
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "abilitymgrcontrolinterceptor_fuzzer.cpp",
   ]

test/fuzztest/abilitymgrecologicalrulemgrserviceparam_fuzzer/BUILD.gn

@@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrEcologicalRuleMgrServiceParamFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilitymgrextensionrecord_fuzzer/BUILD.gn

@@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrExtensionRecordFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilitymgrinsightintentexecutemanager_fuzzer/BUILD.gn

@@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -40,7 +41,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteManagerFuzzTest") {
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "abilitymgrinsightintentexecutemanager_fuzzer.cpp",
   ]
 

test/fuzztest/abilitymgrinsightintentexecuteresult_fuzzer/BUILD.gn

@@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -40,7 +41,7 @@ ohos_fuzztest("AbilityMgrInsightIntentExecuteResultFuzzTest") {
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_result.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "abilitymgrinsightintentexecuteresult_fuzzer.cpp",
   ]
 

test/fuzztest/abilitymgrinsightintentutils_fuzzer/BUILD.gn

@@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -40,7 +41,7 @@ ohos_fuzztest("AbilityMgrInsightIntentUtilsFuzzTest") {
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_result.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "abilitymgrinsightintentutils_fuzzer.cpp",
   ]
 

test/fuzztest/abilitymgrinterceptorexecuter_fuzzer/BUILD.gn

@@ -29,6 +29,7 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -39,7 +40,7 @@ ohos_fuzztest("AbilityMgrInterceptorExecuterFuzzTest") {
   ]
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "abilitymgrinterceptorexecuter_fuzzer.cpp",
   ]

test/fuzztest/abilitymgrjumpinterceptor_fuzzer/BUILD.gn

@@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -40,7 +41,7 @@ ohos_fuzztest("AbilityMgrJumpInterceptorFuzzTest") {
   ]
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "abilitymgrjumpinterceptor_fuzzer.cpp",
   ]

test/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer/BUILD.gn

@@ -25,6 +25,7 @@ ohos_fuzztest("AbilitymgrPreloadUiextStateObserverFuzzTest") {
   fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilitymgrpreloaduiextstateobserver_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilitymgrrdbparserutil_fuzzer/BUILD.gn

@@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrRdbParserUtilFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/abilitymgr/include/rdb",
   ]

test/fuzztest/abilitymgrrestartappmanager_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("AbilitymgrRestartAppManagerFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/abilitymgrrestartappmanager_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilitymgruiextensionrecord_fuzzer/BUILD.gn

@@ -30,6 +30,7 @@ ohos_fuzztest("AbilityMgrUiExtensionRecordFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/abilitymgruiextensionsessioninfo_fuzzer/BUILD.gn

@@ -25,6 +25,7 @@ ohos_fuzztest("AbilitymgrUiExtensionSessionInfoFuzzTest") {
   fuzz_config_file = "${ability_runtime_test_path}/fuzztest/abilitymgruiextensionsessioninfo_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/assertfaultcallbackdeathmgr_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("AssertFaultCallbackDeathMgrFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/assertfaultcallbackdeathmgr_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/assertfaultproxy_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("AssertFaultProxyFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/assertfaultproxy_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/autostartupinfo_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("AutoStartupInfoFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/autostartupinfo_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/dialogsessioninfo_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("DialogSessionInfoFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/dialogsessioninfo_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/dialogsessionmanager_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("DialogSessionManagerFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/dialogsessionmanager_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -36,7 +37,7 @@ ohos_fuzztest("DialogSessionManagerFuzzTest") {
   ]
   sources = [
     "${ability_runtime_path}/services/abilitymgr/src/dialog_session/dialog_session_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "dialogsessionmanager_fuzzer.cpp",
   ]
 
@@ -56,6 +57,7 @@ ohos_fuzztest("DialogSessionManagerFuzzTest") {
     "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/server/startup:startup_util",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
+    "${ability_runtime_services_path}/common:app_util",
     "${ability_runtime_services_path}/common:perm_verification",
     "//third_party/jsoncpp:jsoncpp",
     "//third_party/libjpeg-turbo:turbojpeg_static",

test/fuzztest/disposedobserver_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("DisposedObserverFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/disposedobserver_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/extensionconfig_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("ExtensionConfigFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/extensionconfig_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/extensioncontrolinterceptor_fuzzer/BUILD.gn

@@ -40,7 +40,7 @@ ohos_fuzztest("ExtensionControlInterceptorFuzzTest") {
   ]
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "extension_control_interceptor_fuzzer.cpp",
   ]

test/fuzztest/extensionpermissionsutil_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("ExtensionPermissionsUtilFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/extensionpermissionsutil_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "mock/include",
   ]

test/fuzztest/extensionrecordfactory_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("ExtensionRecordFactoryFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/extensionrecordfactory_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/extensionrecordmanager_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("ExtensionRecordManagerFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/extensionrecordmanager_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/fuzztest/freezeutil_fuzzer/BUILD.gn

@@ -30,6 +30,7 @@ ohos_fuzztest("FreezeUtilFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -40,7 +41,7 @@ ohos_fuzztest("FreezeUtilFuzzTest") {
   ]
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "freezeutil_fuzzer.cpp",
   ]

test/fuzztest/openlinkoptions_fuzzer/BUILD.gn

@@ -31,6 +31,7 @@ ohos_fuzztest("OpenLinkOptionsFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -41,7 +42,7 @@ ohos_fuzztest("OpenLinkOptionsFuzzTest") {
   ]
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "openlinkoptions_fuzzer.cpp",
   ]

test/fuzztest/screenunlockinterceptor_fuzzer/BUILD.gn

@@ -31,6 +31,7 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/abilitymgr/include/interceptor",
     "${ability_runtime_utils_path}/server/startup/include",
@@ -46,7 +47,7 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") {
     "${ability_runtime_path}/frameworks/native/appkit/ability_bundle_manager_helper/bundle_mgr_helper.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/screen_unlock_interceptor.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "screenunlockinterceptor_fuzzer.cpp",
   ]
@@ -60,6 +61,7 @@ ohos_fuzztest("ScreenUnlockInterceptorFuzzTest") {
     "${ability_runtime_path}/utils/server/startup:startup_util",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/appmgr:libappms",
+    "${ability_runtime_services_path}/common:app_util",
     "${ability_runtime_services_path}/common:perm_verification",
     "//third_party/jsoncpp:jsoncpp",
     "//third_party/libjpeg-turbo:turbojpeg_static",

test/fuzztest/startabilityutils_fuzzer/BUILD.gn

@@ -37,7 +37,7 @@ ohos_fuzztest("StartAbilityUtilsFuzzTest") {
   ]
 
   sources = [
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "startabilityutils_fuzzer.cpp",
   ]
 

test/fuzztest/startotherappinterceptor_fuzzer/BUILD.gn

@@ -31,6 +31,7 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/abilitymgr/include/interceptor",
     "${ability_runtime_utils_path}/server/startup/include",
@@ -45,7 +46,7 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") {
   sources = [
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/start_other_app_interceptor.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "startotherappinterceptor_fuzzer.cpp",
   ]
@@ -56,6 +57,7 @@ ohos_fuzztest("StartOtherappinterceptorFuzzTest") {
     cflags += [ "-DBINDER_IPC_32BIT" ]
   }
   deps = [
+    "${ability_runtime_native_path}/appkit:appkit_manager_helper",
     "${ability_runtime_path}/utils/server/startup:startup_util",
     "${ability_runtime_services_path}/abilitymgr:abilityms",
     "${ability_runtime_services_path}/appmgr:libappms",

test/fuzztest/statusbardelegatemanager_fuzzer/BUILD.gn

@@ -31,6 +31,7 @@ ohos_fuzztest("StatusBarDelegateManagerFuzzTest") {
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [
@@ -43,8 +44,8 @@ ohos_fuzztest("StatusBarDelegateManagerFuzzTest") {
     "${ability_runtime_services_path}/abilitymgr/src/app_scheduler.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/process_options.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/scene_board/status_bar_delegate_manager.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/start_window_option.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/state_utils.cpp",
     "statusbardelegatemanager_fuzzer.cpp",
   ]

test/fuzztest/uiextensionrecordfactory_fuzzer/BUILD.gn

@@ -26,6 +26,7 @@ ohos_fuzztest("UIExtensionRecordFactoryFuzzTest") {
       "${ability_runtime_test_path}/fuzztest/uiextensionrecordfactory_fuzzer"
   include_dirs = [
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
   cflags = [

test/mock/services_abilitymgr_test/appmgr_test_service/BUILD.gn

@@ -17,6 +17,7 @@ import("//foundation/ability/ability_runtime/ability_runtime.gni")
 config("appmgr_test_service_config") {
   include_dirs = [
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/appmgr_test_service/include/",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_innerkits_path}/app_manager/include",

test/mock/services_abilitymgr_test/libs/aakit/BUILD.gn

@@ -18,6 +18,7 @@ config("aakit_mock_config") {
   include_dirs = [
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include",
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/app_manager/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/",

test/mock/services_abilitymgr_test/libs/appexecfwk_core/BUILD.gn

@@ -20,6 +20,7 @@ config("appexecfwk_core_mock_config") {
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/include/appmgr",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/include/bundlemgr",
     "${ability_runtime_innerkits_path}/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/",

test/moduletest/ability_delegator_test/BUILD.gn

@@ -35,6 +35,7 @@ config("moduletest_include_dir") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_delegator/runner_runtime/",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "//third_party/googletest/googlemock/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context/",
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app/",

test/moduletest/ability_test/BUILD.gn

@@ -32,6 +32,7 @@ config("module_private_config") {
     "${ability_runtime_services_path}/common/include",
     "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
     "${ability_runtime_test_path}/mock/frameworks_kits_test/DemoAbility",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "//third_party/jsoncpp/include",
     "${ability_runtime_innerkits_path}/dataobs_manager/include",

test/moduletest/ability_timeout_module_test/BUILD.gn

@@ -30,7 +30,6 @@ ohos_moduletest("ability_timeout_module_test") {
   sources = [ "ability_timeout_module_test.cpp" ]
   sources += [
     "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/app_exit_reason_data_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/assert_fault_callback_death_mgr.cpp",
@@ -39,6 +38,7 @@ ohos_moduletest("ability_timeout_module_test") {
     "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/window_focus_changed_listener.cpp",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/sa_mgr/src/sa_mgr_client_mock.cpp",
     "${ability_runtime_test_path}/moduletest/mock/src/mock_app_mgr_client.cpp",

test/moduletest/running_infos_module_test/BUILD.gn

@@ -31,7 +31,6 @@ ohos_moduletest("running_infos_module_test") {
   sources = [ "running_infos_module_test.cpp" ]
   sources += [
     "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/app_exit_reason_data_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/assert_fault_callback_death_mgr.cpp",
@@ -40,6 +39,7 @@ ohos_moduletest("running_infos_module_test") {
     "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/window_focus_changed_listener.cpp",
     "${ability_runtime_test_path}/mock/common/src/mock_native_token.cpp",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/sa_mgr/src/sa_mgr_client_mock.cpp",

test/unittest/BUILD.gn

@@ -114,7 +114,6 @@ ohos_source_set("abilityms_test_source") {
     "${ability_runtime_services_path}/abilitymgr/src/ability_connect_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_debug_deal.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_event_handler.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_manager_collaborator_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_manager_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp",
@@ -153,7 +152,6 @@ ohos_source_set("abilityms_test_source") {
     "${ability_runtime_services_path}/abilitymgr/src/free_install_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_profile.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/insight_intent_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/ability_interceptor_executer.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/ability_jump_interceptor.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/control_interceptor.cpp",
@@ -173,7 +171,6 @@ ohos_source_set("abilityms_test_source") {
     "${ability_runtime_services_path}/abilitymgr/src/sender_info.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/start_ability_handler/start_ability_sandbox_savefile.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/task_data_persistence_mgr.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ui_extension_record.cpp",
@@ -181,6 +178,9 @@ ohos_source_set("abilityms_test_source") {
     "${ability_runtime_services_path}/abilitymgr/src/uri_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/user_controller.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/user_event_handler.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/insight_intent_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/want_receiver_proxy.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/want_receiver_stub.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/want_sender_info.cpp",

test/unittest/ability_bundle_event_callback_test/BUILD.gn

@@ -30,7 +30,7 @@ ohos_unittest("ability_bundle_event_callback_test") {
   sources = [
     "${ability_runtime_path}/services/abilitymgr/src/ability_auto_startup_data_manager.cpp",
     "${ability_runtime_path}/services/abilitymgr/src/ability_auto_startup_service.cpp",
-    "${ability_runtime_path}/services/abilitymgr/src/ability_event_util.cpp",
+    "${ability_runtime_path}/services/abilitymgr/src/utils/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp",
     "ability_bundle_event_callback_test.cpp",

test/unittest/ability_debug_deal_test/BUILD.gn

@@ -23,6 +23,7 @@ ohos_unittest("ability_debug_deal_test") {
     "${ability_runtime_path}/test/mock/services_appmgr_test/include",
     "${ability_runtime_path}/interfaces/inner_api/include",
     "${ability_runtime_path}/frameworks/native/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
 

test/unittest/ability_debug_response_stub_test/BUILD.gn

@@ -23,6 +23,7 @@ ohos_unittest("ability_debug_response_stub_test") {
     "${ability_runtime_path}/test/mock/services_appmgr_test/include",
     "${ability_runtime_path}/interfaces/inner_api/include",
     "${ability_runtime_path}/frameworks/native/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appmgr/include",
   ]

test/unittest/ability_first_frame_state_observer_manager_test/BUILD.gn

@@ -21,6 +21,7 @@ ohos_unittest("ability_first_frame_state_observer_manager_test") {
   module_out_path = module_output_path
 
   include_dirs = [
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
     "mock/include",

test/unittest/ability_interceptor_second_test/BUILD.gn

@@ -26,12 +26,13 @@ ohos_unittest("ability_interceptor_second_test") {
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
 
   sources = [
     # add mock file
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp",
     "ability_interceptor_second_test.cpp",
   ]

test/unittest/ability_interceptor_test/BUILD.gn

@@ -26,12 +26,13 @@ ohos_unittest("ability_interceptor_test") {
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
 
   sources = [
     # add mock file
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/appexecfwk_core/src/appmgr/mock_app_scheduler.cpp",
     "ability_interceptor_test.cpp",
   ]

test/unittest/ability_interceptor_third_test/BUILD.gn

@@ -26,6 +26,7 @@ ohos_unittest("ability_interceptor_third_test") {
     "${distributedschedule_path}/samgr/adapter/interfaces/innerkits/include/",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/abilitymgr/include/interceptor",
   ]
@@ -33,7 +34,7 @@ ohos_unittest("ability_interceptor_third_test") {
   sources = [
     # add mock file
     "${ability_runtime_services_path}/abilitymgr/src/interceptor/ability_interceptor_executer.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/start_ability_utils.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/start_ability_utils.cpp",
     "ability_interceptor_third_test.cpp",
   ]
 

test/unittest/ability_manager_collaborator_proxy_test/BUILD.gn

@@ -21,6 +21,7 @@ ohos_unittest("ability_manager_collaborator_proxy_test") {
 
   include_dirs = [
     "${ability_runtime_path}/interfaces/inner_api/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_test_path}/unittest/ability_manager_proxy_test/",
   ]

test/unittest/ability_manager_service_fourth_test/BUILD.gn

@@ -31,6 +31,7 @@ ohos_unittest("ability_manager_service_fourth_test") {
     "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime/",
     "${ability_runtime_path}/interfaces/inner_api/ability_manager/include",
     "${ability_runtime_path}/services/abilitymgr/include/interceptor/",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
     "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
@@ -44,11 +45,11 @@ ohos_unittest("ability_manager_service_fourth_test") {
     "${ability_runtime_services_path}/abilitymgr/src/ability_auto_startup_service.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_connect_callback_stub.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/auto_startup_info.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/exit_reason.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/insight_intent_execute_manager.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/modal_system_dialog/modal_system_dialog_ui_extension.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/utils/modal_system_dialog_util.cpp",
     "${ability_runtime_services_path}/common/src/ffrt_task_handler_wrap.cpp",
     "${ability_runtime_services_path}/common/src/queue_task_handler_wrap.cpp",

test/unittest/ability_manager_service_third_test/BUILD.gn

@@ -29,6 +29,7 @@ ohos_unittest("ability_manager_service_third_test") {
     "${ability_runtime_innerkits_path}/uri_permission/include",
     "${ability_runtime_path}/interfaces/kits/native/ability/ability_runtime/",
     "${ability_runtime_path}/interfaces/inner_api/ability_manager/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
     "${ability_runtime_test_path}/mock/mock_sa_call",
@@ -42,9 +43,9 @@ ohos_unittest("ability_manager_service_third_test") {
     "${ability_runtime_services_path}/abilitymgr/src/ability_auto_startup_service.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_bundle_event_callback.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/ability_connect_callback_stub.cpp",
-    "${ability_runtime_services_path}/abilitymgr/src/ability_event_util.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/auto_startup_info.cpp",
     "${ability_runtime_services_path}/abilitymgr/src/deeplink_reserve/deeplink_reserve_config.cpp",
+    "${ability_runtime_services_path}/abilitymgr/src/utils/ability_event_util.cpp",
     "${ability_runtime_services_path}/common/src/ffrt_task_handler_wrap.cpp",
     "${ability_runtime_services_path}/common/src/queue_task_handler_wrap.cpp",
     "${ability_runtime_services_path}/common/src/task_handler_wrap.cpp",

test/unittest/ability_running_info_test/BUILD.gn

@@ -21,6 +21,7 @@ ohos_unittest("ability_running_info_test") {
 
   include_dirs = [
     "${bundlefwk_inner_api_path}/appexecfwk_base/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
   ]
 

test/unittest/ams_mgr_proxy_test/BUILD.gn

@@ -22,6 +22,7 @@ ohos_unittest("AmsMgrProxyTest") {
   include_dirs = [
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appmgr/include",
     "${ability_runtime_test_path}/mock/services_appmgr_test/include",

test/unittest/ams_mgr_stub_test/BUILD.gn

@@ -21,6 +21,7 @@ ohos_unittest("AmsMgrStubTest") {
 
   include_dirs = [
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_bundle_manager_helper",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appmgr/include",
     "${ability_runtime_test_path}/mock/services_appmgr_test/include",

test/unittest/app_lifecycle_deal_test/BUILD.gn

@@ -27,6 +27,7 @@ ohos_unittest("app_lifecycle_deal_test") {
   include_dirs = [
     "${ability_runtime_test_path}/mock/common/include",
     "${ability_runtime_test_path}/mock/services_appmgr_test/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appmgr/include",
     "${ability_runtime_services_path}/appmgr/test/unittest/mocks",

test/unittest/app_mgr_client_first_test/BUILD.gn

@@ -25,6 +25,7 @@ ohos_unittest("app_mgr_client_first_test") {
   ]
 
   include_dirs = [
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appmgr/test/unittest/mocks",
     "${ability_runtime_test_path}/mock/common/include",

test/unittest/app_mgr_client_test/BUILD.gn

@@ -25,6 +25,7 @@ ohos_unittest("AppMgrClientTest") {
   ]
 
   include_dirs = [
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appmgr/test/unittest/mocks",
     "${ability_runtime_test_path}/mock/common/include",

test/unittest/app_mgr_service_inner_second_test/BUILD.gn

@@ -34,6 +34,7 @@ ohos_unittest("AppMgrServiceInnerSecondTest") {
     "${ability_runtime_test_path}/mock/services_appmgr_test/include",
     "${ability_runtime_test_path}/mock/task_handler_wrap_mock/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/appdfr/include",
     "${ability_runtime_test_path}/moduletest/mock/include",

test/unittest/app_mgr_service_inner_tdd_test/BUILD.gn

@@ -29,7 +29,9 @@ ohos_unittest("app_mgr_service_inner_tdd_test") {
     "${ability_runtime_test_path}/mock/common/include",
     "${ability_runtime_test_path}/mock/frameworks_kits_ability_native_test/include",
     "${ability_runtime_test_path}/mock/services_appmgr_test/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
+
     "${ability_runtime_test_path}/moduletest/mock/include",
   ]
 

test/unittest/app_mgr_service_inner_test/BUILD.gn

@@ -32,7 +32,9 @@ ohos_unittest("AppMgrServiceInnerTest") {
     "${ability_runtime_test_path}/mock/services_appmgr_test/include",
     "${ability_runtime_test_path}/mock/task_handler_wrap_mock/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
+
     "${ability_runtime_test_path}/moduletest/mock/include",
   ]
 

test/unittest/app_scheduler_test/BUILD.gn

@@ -29,7 +29,9 @@ ohos_unittest("app_scheduler_test") {
   branch_protector_ret = "pac_ret"
 
   include_dirs = [
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
+
     "${ability_runtime_test_path}/mock/mock_sa_call",
     "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/system_ability_mock",
     "${ability_runtime_test_path}/unittest/app_debug_listener_proxy_test",

test/unittest/assert_fault_callback_death_mgr_test/BUILD.gn

@@ -26,7 +26,9 @@ ohos_unittest("assert_fault_callback_death_mgr_test") {
   branch_protector_ret = "pac_ret"
 
   include_dirs = [
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
+
     "${ability_runtime_test_path}/unittest/app_debug_listener_proxy_test",
     "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include",
   ]

test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_proxy_test/BUILD.gn

@@ -36,7 +36,9 @@ config("ability_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_innerkits_path}/uri/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
+
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${form_fwk_path}/interfaces/kits/native/include",

test/unittest/continuation_test/remote_register_service_test/continuation_register_manager_test/BUILD.gn

@@ -36,7 +36,9 @@ config("ability_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_innerkits_path}/uri/include",
+    "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
+
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/app",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
     "${form_fwk_path}/interfaces/kits/native/include",