Desc:del unused fuc and var for one buildt push -f

Signed-off-by: jiangzhijun8 <jiangzhijun7@huawei.com>

frameworks/js/napi/ability/BUILD.gn

@@ -48,11 +48,7 @@ template("ohos_ability_napi") {
       ":ability_js",
     ]
 
-    external_deps = [
-      "napi:ace_napi",
-      "ets_runtime:libark_jsruntime",
-      "runtime_core:libarkfile_static",
-    ]
+    external_deps = [ "napi:ace_napi" ]
 
     subsystem_name = "ability"
     part_name = "ability_runtime"

frameworks/js/napi/abilityDataUriUtils/BUILD.gn

@@ -42,11 +42,7 @@ ohos_shared_library("datauriutils") {
     ":ability_data_uri_utils_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    "runtime_core:libarkfile_static",
-  ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/ability_auto_startup_callback/BUILD.gn

@@ -40,11 +40,11 @@ ohos_shared_library("autostartupcallback") {
   external_deps = [
     "ability_base:session_info",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
     "napi:ace_napi",
+    "window_manager:libwm"
   ]
 
   if (ability_runtime_graphics) {

frameworks/js/napi/ability_auto_startup_manager/BUILD.gn

@@ -44,7 +44,6 @@ ohos_shared_library("autostartupmanager") {
     "access_token:libtokenid_sdk",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",

frameworks/js/napi/ability_context/BUILD.gn

@@ -42,11 +42,7 @@ ohos_shared_library("abilitycontext_napi") {
     ":ability_context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    "runtime_core:libarkfile_static",
-  ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/ability_manager/BUILD.gn

@@ -50,7 +50,6 @@ template("abilitymanager") {
       "access_token:libtokenid_sdk",
       "c_utils:utils",
       "common_event_service:cesfwk_innerkits",
-      "ets_runtime:libark_jsruntime",
       "eventhandler:libeventhandler",
       "hilog:libhilog",
       "icu:shared_icuuc",

frameworks/js/napi/action_extension_ability/BUILD.gn

@@ -42,11 +42,7 @@ ohos_shared_library("actionextensionability_napi") {
     ":action_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    "runtime_core:libarkfile_static",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/app/ability_delegator/BUILD.gn

@@ -53,13 +53,11 @@ template("delegator") {
       "bundle_framework:appexecfwk_base",
       "c_utils:utils",
       "common_event_service:cesfwk_innerkits",
-      "ets_runtime:libark_jsruntime",
       "eventhandler:libeventhandler",
       "hilog:libhilog",
       "hitrace:hitrace_meter",
       "napi:ace_napi",
       "ipc:ipc_napi",
-      # "resource_management:global_resmgr",
     ]
 
     cflags_cc = []

frameworks/js/napi/app/ability_lifecycle_callback/BUILD.gn

@@ -42,12 +42,8 @@ ohos_shared_library("abilitylifecyclecallback") {
     ":ability_lifecycle_callback_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    "runtime_core:libarkfile_static",
-    ]
-
+  external_deps = [ "napi:ace_napi" ]
+  
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"
   part_name = "ability_runtime"

frameworks/js/napi/app/ability_stage/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("abilitystage") {
     ":ability_stage_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   defines = [ "ENABLE_ERRCODE" ]
 
@@ -62,11 +59,7 @@ ohos_shared_library("abilitystage_napi") {
     ":ability_stage_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    "runtime_core:libarkfile_static",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/app/ability_stage_context/BUILD.gn

@@ -42,11 +42,7 @@ ohos_shared_library("abilitystagecontext_napi") {
     ":ability_stage_context_js",
   ]
 
-  external_deps = [
-  "napi:ace_napi",
-  "ets_runtime:libark_jsruntime",
-  "runtime_core:libarkfile_static",
-  ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/app/app_manager/BUILD.gn

@@ -42,7 +42,6 @@ ohos_shared_library("appmanager_napi") {
   external_deps = [
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",

frameworks/js/napi/app/application_context/BUILD.gn

@@ -42,11 +42,7 @@ ohos_shared_library("applicationcontext_napi") {
     ":application_context_js",
   ]
 
-  external_deps = [
-  "napi:ace_napi",
-  "ets_runtime:libark_jsruntime",
-  "runtime_core:libarkfile_static",
-  ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/app/application_state_change_callback/BUILD.gn

@@ -44,11 +44,7 @@ ohos_shared_library("applicationstatechangecallback") {
     ":application_state_change_callback_js",
   ]
 
-  external_deps = [
-  "napi:ace_napi",
-  "ets_runtime:libark_jsruntime",
-  "runtime_core:libarkfile_static",
-  ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/app/context/BUILD.gn

@@ -41,12 +41,8 @@ ohos_shared_library("context_napi") {
     ":context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    "runtime_core:libarkfile_static",
-  ]
-
+  external_deps = [ "napi:ace_napi" ]
+  
   relative_install_dir = "module/application"
   subsystem_name = "ability"
   part_name = "ability_runtime"

frameworks/js/napi/app/environment_callback/BUILD.gn

@@ -42,11 +42,7 @@ ohos_shared_library("environmentcallback") {
     ":environment_callback_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    "runtime_core:libarkfile_static",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/app/error_manager/BUILD.gn

@@ -42,7 +42,6 @@ template("errormanager") {
 
     external_deps = [
       "c_utils:utils",
-      "ets_runtime:libark_jsruntime",
       "eventhandler:libeventhandler",
       "hilog:libhilog",
       "napi:ace_napi",

frameworks/js/napi/app/recovery/BUILD.gn

@@ -46,7 +46,6 @@ ohos_shared_library("apprecovery_napi") {
     "ability_base:want",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "napi:ace_napi",

frameworks/js/napi/app/sendable_context_manager/BUILD.gn

@@ -52,7 +52,6 @@ ohos_shared_library("sendablecontextmanager_napi") {
     "ability_base:want",
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "napi:ace_napi",

frameworks/js/napi/app/test_runner/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("testrunner_napi") {
     ":test_runner_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/app_startup/async_task_callback/BUILD.gn

@@ -53,10 +53,7 @@ ohos_shared_library("asynctaskcallback_napi") {
     ":async_task_callback_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/appstartup"
   subsystem_name = "ability"

frameworks/js/napi/app_startup/async_task_excutor/BUILD.gn

@@ -53,11 +53,7 @@ ohos_shared_library("asynctaskexcutor_napi") {
     ":async_task_excutor_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
-
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/appstartup"
   subsystem_name = "ability"

frameworks/js/napi/app_startup/startup_config_entry/BUILD.gn

@@ -53,10 +53,7 @@ ohos_shared_library("startupconfigentry_napi") {
     ":startup_config_entry_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/appstartup"
   subsystem_name = "ability"

frameworks/js/napi/app_startup/startup_listener/BUILD.gn

@@ -53,10 +53,7 @@ ohos_shared_library("startuplistener_napi") {
     ":startup_listener_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/appstartup"
   subsystem_name = "ability"

frameworks/js/napi/app_startup/startup_task/BUILD.gn

@@ -53,10 +53,7 @@ ohos_shared_library("startuptask_napi") {
     ":startup_task_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/appstartup"
   subsystem_name = "ability"

frameworks/js/napi/application/BUILD.gn

@@ -54,7 +54,6 @@ ohos_shared_library("application_napi") {
     "access_token:libaccesstoken_sdk",
     "access_token:libtokenid_sdk",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "ipc:ipc_core",
     "napi:ace_napi",

frameworks/js/napi/auto_fill_extension_ability/BUILD.gn

@@ -42,11 +42,8 @@ ohos_shared_library("autofillextensionability_napi") {
     ":auto_fill_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
-
+  external_deps = [ "napi:ace_napi" ]
+  
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"
   part_name = "ability_runtime"

frameworks/js/napi/auto_fill_extension_context/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("autofillextensioncontext_napi") {
     ":auto_fill_extension_context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/auto_fill_manager/BUILD.gn

@@ -39,7 +39,6 @@ ohos_shared_library("autofillmanager_napi") {
     "ability_base:view_data",
     "ability_base:want",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",

frameworks/js/napi/callee/BUILD.gn

@@ -41,10 +41,7 @@ ohos_shared_library("callee_napi") {
     ":callee_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/caller/BUILD.gn

@@ -41,11 +41,7 @@ ohos_shared_library("caller_napi") {
     ":caller_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
-
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/dialog_request_info/BUILD.gn

@@ -33,7 +33,6 @@ ohos_shared_library("dialog_request_info") {
     "ability_base:base",
     "ability_base:want",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "ipc:ipc_core",
     "napi:ace_napi",

frameworks/js/napi/embeddable_ui_ability/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("embeddableuiability_napi") {
     ":embeddable_ui_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/embeddable_ui_ability_context/BUILD.gn

@@ -43,10 +43,7 @@ ohos_shared_library("embeddableuiabilitycontext_napi") {
     ":embeddable_ui_ability_context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/embedded_ui_extension_ability/BUILD.gn

@@ -54,10 +54,7 @@ ohos_shared_library("embeddeduiextensionability_napi") {
     ":embedded_ui_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/extension_ability/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("extensionability_napi") {
     ":extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/extensioncontext/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("extensioncontext_napi") {
     ":extension_context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/featureAbility/BUILD.gn

@@ -75,7 +75,6 @@ ohos_shared_library("featureability") {
       "data_ability/napi_result_set.cpp",
     ]
     external_deps += [
-      "ets_runtime:libark_jsruntime",
       "eventhandler:libeventhandler",
       "kv_store:distributeddata_mgr",
       "relational_store:native_appdatafwk",

frameworks/js/napi/featureAbility/napi_data_ability_helper.cpp

@@ -996,12 +996,12 @@ napi_value DenormalizeUriWrap(napi_env env, napi_callback_info info, DAHelperDen
 
 void UnwrapDataAbilityPredicates(NativeRdb::DataAbilityPredicates &predicates, napi_env env, napi_value value)
 {
-    // auto tempPredicates = DataAbilityJsKit::DataAbilityPredicatesProxy::GetNativePredicates(env, value);
-    // if (tempPredicates == nullptr) {
-    //     TAG_LOGE(AAFwkTag::FA, "null tempPredicates");
-    //     return;
-    // }
-    // predicates = *tempPredicates;
+    auto tempPredicates = DataAbilityJsKit::DataAbilityPredicatesProxy::GetNativePredicates(env, value);
+    if (tempPredicates == nullptr) {
+        TAG_LOGE(AAFwkTag::FA, "null tempPredicates");
+        return;
+    }
+    predicates = *tempPredicates;
 }
 
 /**

frameworks/js/napi/featureAbility/napi_data_ability_helper_utils.cpp

@@ -1577,14 +1577,13 @@ napi_value QueryPromise(napi_env env, DAHelperQueryCB *queryCB)
 
 napi_value WrapResultSet(napi_env env, const std::shared_ptr<NativeRdb::AbsSharedResultSet> &resultSet)
 {
-    // TAG_LOGD(AAFwkTag::FA, "called");
-    // if (resultSet == nullptr) {
-    //     TAG_LOGE(AAFwkTag::FA, "null resultSet");
-    //     return WrapVoidToJS(env);
-    // }
+    TAG_LOGD(AAFwkTag::FA, "called");
+    if (resultSet == nullptr) {
+        TAG_LOGE(AAFwkTag::FA, "null resultSet");
+        return WrapVoidToJS(env);
+    }
 
-    // return RdbJsKit::ResultSetProxy::NewInstance(env, resultSet);
-    return WrapVoidToJS(env);
+    return RdbJsKit::ResultSetProxy::NewInstance(env, resultSet);
 }
 
 napi_value ExecuteBatchAsync(

frameworks/js/napi/feature_ability/BUILD.gn

@@ -37,7 +37,6 @@ ohos_shared_library("featureability_napi") {
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "napi:ace_napi",

frameworks/js/napi/inner/napi_ability_common/BUILD.gn

@@ -53,7 +53,6 @@ ohos_shared_library("napi_ability_common") {
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "ipc:ipc_core",
     "ipc:ipc_napi",

frameworks/js/napi/inner/napi_common/BUILD.gn

@@ -55,7 +55,6 @@ ohos_shared_library("napi_common") {
     "access_token:libtokenid_sdk",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
@@ -63,6 +62,7 @@ ohos_shared_library("napi_common") {
     "json:nlohmann_json_static",
     "libuv:uv",
     "napi:ace_napi",
+    "window_manager:libwm",
   ]
 
   public_external_deps = [

frameworks/js/napi/insight_intent/insight_intent/BUILD.gn

@@ -33,7 +33,6 @@ ohos_shared_library("insightintent_napi") {
     "ability_base:want",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "ipc:ipc_core",
     "napi:ace_napi",

frameworks/js/napi/insight_intent/insight_intent_driver/BUILD.gn

@@ -37,7 +37,6 @@ ohos_shared_library("insightintentdriver_napi") {
     "ability_base:want",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",

frameworks/js/napi/insight_intent/insight_intent_executor/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("insightintentexecutor_napi") {
     ":insight_intent_executor_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/js_child_process/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("childprocess_napi") {
     ":child_process_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/js_child_process_manager/BUILD.gn

@@ -35,7 +35,6 @@ ohos_shared_library("childprocessmanager_napi") {
 
   external_deps = [
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",

frameworks/js/napi/js_dialog_request/BUILD.gn

@@ -43,7 +43,6 @@ ohos_shared_library("dialogrequest_napi") {
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "ipc:ipc_core",
     "ipc:ipc_napi",

frameworks/js/napi/js_dialog_session/BUILD.gn

@@ -41,7 +41,6 @@ ohos_shared_library("dialogsession_napi") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "hilog:libhilog",
@@ -50,6 +49,7 @@ ohos_shared_library("dialogsession_napi") {
     "ipc:ipc_napi",
     "napi:ace_napi",
     "samgr:samgr_proxy",
+    "window_manager:libwm",
   ]
 
   cflags_cc = []

frameworks/js/napi/js_mission_manager/BUILD.gn

@@ -41,7 +41,6 @@ ohos_shared_library("missionmanager") {
     "ability_base:want",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",

frameworks/js/napi/mission_manager/BUILD.gn

@@ -40,7 +40,6 @@ ohos_shared_library("missionmanager_napi") {
     "ability_base:want",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
@@ -103,7 +102,6 @@ ohos_shared_library("distributedmissionmanager") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "init:libbegetutil",

frameworks/js/napi/particleAbility/BUILD.gn

@@ -70,7 +70,6 @@ ohos_shared_library("particleability") {
       "../featureAbility/data_ability/napi_result_set.cpp",
     ]
     external_deps += [
-      "ets_runtime:libark_jsruntime",
       "eventhandler:libeventhandler",
       "kv_store:distributeddata_mgr",
       "relational_store:native_appdatafwk",

frameworks/js/napi/photo_editor_extension_ability/BUILD.gn

@@ -53,10 +53,7 @@ ohos_shared_library("photoeditorextensionability_napi") {
     ":photo_editor_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/photo_editor_extension_context/BUILD.gn

@@ -53,11 +53,8 @@ ohos_shared_library("photoeditorextensioncontext_napi") {
     ":photo_editor_extension_context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
-
+  external_deps = [ "napi:ace_napi" ]
+  
   relative_install_dir = "module/application"
   subsystem_name = "ability"
   part_name = "ability_runtime"

frameworks/js/napi/quick_fix/BUILD.gn

@@ -38,7 +38,6 @@ ohos_shared_library("quickfixmanager_napi") {
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "napi:ace_napi",

frameworks/js/napi/service_extension_ability/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("serviceextensionability_napi") {
     ":service_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"
@@ -60,10 +57,7 @@ ohos_shared_library("serviceextensionability") {
     ":service_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   defines = [ "ENABLE_ERRCODE" ]
 

frameworks/js/napi/service_extension_context/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("serviceextensioncontext_napi") {
     ":service_extension_context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/share_extension_ability/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("shareextensionability_napi") {
     ":share_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/ui_extension_ability/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("uiextensionability_napi") {
     ":ui_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/app/ability"
   subsystem_name = "ability"

frameworks/js/napi/ui_extension_context/BUILD.gn

@@ -42,10 +42,7 @@ ohos_shared_library("uiextensioncontext_napi") {
     ":ui_extension_context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"

frameworks/js/napi/ui_service_extension_ability/BUILD.gn

@@ -53,10 +53,7 @@ ohos_shared_library("uiserviceextensionability_napi") {
     ":ui_service_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   relative_install_dir = "module/application"
   subsystem_name = "ability"
@@ -82,10 +79,7 @@ ohos_shared_library("uiserviceextensionability") {
     ":ui_service_extension_ability_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
+  external_deps = [ "napi:ace_napi" ]
 
   defines = [ "ENABLE_ERRCODE" ]
 

frameworks/js/napi/ui_service_extension_context/BUILD.gn

@@ -53,11 +53,8 @@ ohos_shared_library("uiserviceextensioncontext_napi") {
     ":ui_service_extension_context_js",
   ]
 
-  external_deps = [
-    "napi:ace_napi",
-    "ets_runtime:libark_jsruntime",
-    ]
-
+  external_deps = [ "napi:ace_napi" ]
+  
   relative_install_dir = "module/application"
   subsystem_name = "ability"
   part_name = "ability_runtime"

frameworks/js/napi/uri_permission/BUILD.gn

@@ -38,7 +38,6 @@ ohos_shared_library("uripermissionmanager_napi") {
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "init:libbegetutil",

frameworks/js/napi/wantagent/BUILD.gn

@@ -43,7 +43,6 @@ ohos_shared_library("wantagent") {
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "ipc:ipc_core",
     "libuv:uv",

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

@@ -43,7 +43,6 @@ ohos_shared_library("wantagent_napi") {
     "access_token:libtokenid_sdk",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "ipc:ipc_core",
     "libuv:uv",

frameworks/native/ability/BUILD.gn

@@ -84,7 +84,6 @@ ohos_shared_library("ability_context_native") {
     "access_token:libtoken_callback_sdk",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "faultloggerd:libdfx_dumpcatcher",
     "hilog:libhilog",

frameworks/native/ability/native/BUILD.gn

@@ -331,12 +331,12 @@ ohos_shared_library("abilitykit_native") {
     "ability_base:want",
     "ability_base:zuri",
     "access_token:libaccesstoken_sdk",
+    "access_token:libtoken_callback_sdk",
     "access_token:libtokenid_sdk",
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hitrace:hitrace_meter",
@@ -349,6 +349,7 @@ ohos_shared_library("abilitykit_native") {
     "node:node_header_notice",
     "resource_management:global_resmgr",
     "samgr:samgr_proxy",
+    "window_manager:windowstage_kit",
   ]
   if (!(host_os == "linux" && host_cpu == "arm64")) {
     external_deps += [ "relational_store:native_rdb" ]
@@ -413,7 +414,6 @@ ohos_shared_library("abilitykit_native") {
       "input:libmmi-client",
       "window_manager:libwm",
       "window_manager:libwsutils",
-      "window_manager:windowstage_kit",
     ]
 
     public_external_deps += [
@@ -486,7 +486,6 @@ ohos_shared_library("extensionkit_native") {
     "ability_base:want",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
@@ -547,13 +546,13 @@ ohos_shared_library("insight_intent_executor") {
     "access_token:libaccesstoken_sdk",
     "access_token:libtokenid_sdk",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
     "ipc:ipc_napi",
     "napi:ace_napi",
+    "window_manager:libwm",
   ]
 
   subsystem_name = "ability"
@@ -649,6 +648,7 @@ ohos_shared_library("uiabilitykit_native") {
     "libuv:uv",
     "napi:ace_napi",
     "node:node_header_notice",
+    "window_manager:libwm",
   ]
 
   cflags_cc = []
@@ -679,7 +679,6 @@ ohos_shared_library("uiabilitykit_native") {
     external_deps += [
       "ability_base:session_info",
       "icu:shared_icuuc",
-      "window_manager:libwm",
       "window_manager:libwsutils",
       "window_manager:windowstage_kit",
     ]
@@ -781,7 +780,6 @@ ohos_shared_library("form_extension") {
       "access_token:libtokenid_sdk",
       "c_utils:utils",
       "common_event_service:cesfwk_innerkits",
-      "ets_runtime:libark_jsruntime",
       "eventhandler:libeventhandler",
       "hilog:libhilog",
       "hitrace:hitrace_meter",
@@ -822,7 +820,6 @@ ohos_shared_library("form_extension_module") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
@@ -879,7 +876,6 @@ ohos_shared_library("service_extension") {
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
@@ -937,7 +933,6 @@ ohos_shared_library("ui_service_extension_connection") {
     "ability_base:want",
     "access_token:libtokenid_sdk",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "ipc:ipc_core",
     "ipc:ipc_napi",
@@ -1421,7 +1416,6 @@ ohos_shared_library("ui_extension") {
     "access_token:libtokenid_sdk",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
@@ -1518,7 +1512,6 @@ ohos_shared_library("share_extension") {
     "ability_base:want",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_napi",
@@ -1570,7 +1563,6 @@ ohos_shared_library("action_extension") {
     "ability_base:want",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_napi",
@@ -1789,7 +1781,6 @@ ohos_shared_library("embedded_ui_extension") {
     "ability_base:want",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_napi",
@@ -1835,7 +1826,6 @@ ohos_shared_library("embedded_ui_extension_module") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "ipc:ipc_core",
@@ -1896,7 +1886,6 @@ ohos_shared_library("auto_fill_extension") {
     "ace_engine:ace_uicontent",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
@@ -1999,7 +1988,6 @@ ohos_shared_library("photo_editor_extension") {
     "app_file_service:fileuri_native",
     "c_utils:utils",
     "eventhandler:libeventhandler",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "image_framework:image",

frameworks/native/appkit/BUILD.gn

@@ -230,6 +230,9 @@ ohos_shared_library("appkit_native") {
     defines += [ "NWEB" ]
   }
 
+
+  if (ohos_indep_compiler_enable){ memory_utils_purgeable_ashmem_enable = true}
+  
   if (memory_utils_purgeable_ashmem_enable && defined(global_parts_info) &&
       defined(global_parts_info.resourceschedule_memmgr_override)) {
     defines += [ "IMAGE_PURGEABLE_PIXELMAP" ]
@@ -313,7 +316,6 @@ ohos_shared_library("app_context") {
     "ability_base:extractortool",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "init:libbegetutil",
@@ -387,7 +389,6 @@ ohos_shared_library("app_context_utils") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",
@@ -460,7 +461,6 @@ ohos_shared_library("appkit_delegator") {
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "image_framework:image_native",
@@ -556,7 +556,6 @@ ohos_shared_library("application_context_manager") {
   }
 
   external_deps = [
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "napi:ace_napi",
   ]

frameworks/native/appkit/ability_runtime/context/context_impl.cpp

@@ -1027,12 +1027,12 @@ void ContextImpl::UpdateResConfig(std::shared_ptr<Global::Resource::ResourceMana
     resConfig->SetDeviceType(GetDeviceType());
     std::string mcc = config_->GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_MCC);
     std::string mnc = config_->GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_MNC);
-    // try {
-    resConfig->SetMcc(static_cast<uint32_t>(std::stoi(mcc)));
-    resConfig->SetMnc(static_cast<uint32_t>(std::stoi(mnc)));
-    // } catch (...) {
-    //     TAG_LOGD(AAFwkTag::APPKIT, "Set mcc,mnc failed mcc:%{public}s mnc:%{public}s", mcc.c_str(), mnc.c_str());
-    // }
+    try {
+        resConfig->SetMcc(static_cast<uint32_t>(std::stoi(mcc)));
+        resConfig->SetMnc(static_cast<uint32_t>(std::stoi(mnc)));
+    } catch (...) {
+        TAG_LOGD(AAFwkTag::APPKIT, "Set mcc,mnc failed mcc:%{public}s mnc:%{public}s", mcc.c_str(), mnc.c_str());
+    }
     resourceManager->UpdateResConfig(*resConfig);
 }
 

frameworks/native/appkit/app/application_cleaner.cpp

@@ -38,7 +38,7 @@ static const std::string CONTEXT_HAPS{ "/haps" };
 static const size_t MARK_TEMP_LEN = 12;
 static const int PATH_MAX_SIZE = 256;
 
-// const mode_t MODE = 0777;
+const mode_t MODE = 0777;
 static const int RESULT_OK = 0;
 static const int RESULT_ERR = -1;
 

frameworks/native/appkit/app/ohos_application.cpp

@@ -47,7 +47,7 @@
 namespace OHOS {
 namespace AppExecFwk {
 namespace {
-    // constexpr const char* PERSIST_DARKMODE_KEY = "persist.ace.darkmode";
+    constexpr const char* PERSIST_DARKMODE_KEY = "persist.ace.darkmode";
 }
 REGISTER_APPLICATION(OHOSApplication, OHOSApplication)
 constexpr int32_t APP_ENVIRONMENT_OVERWRITE = 1;

frameworks/native/appkit/dfr/appfreeze_inner.cpp

@@ -34,12 +34,12 @@ namespace OHOS {
 using AbilityRuntime::FreezeUtil;
 namespace AppExecFwk {
 namespace {
-// constexpr char EVENT_UID[] = "UID";
+constexpr char EVENT_UID[] = "UID";
 constexpr char EVENT_PID[] = "PID";
 constexpr char EVENT_MESSAGE[] = "MSG";
-// constexpr char EVENT_PACKAGE_NAME[] = "PACKAGE_NAME";
+constexpr char EVENT_PACKAGE_NAME[] = "PACKAGE_NAME";
 constexpr char EVENT_PROCESS_NAME[] = "PROCESS_NAME";
-// constexpr char EVENT_STACK[] = "STACK";
+constexpr char EVENT_STACK[] = "STACK";
 }
 std::weak_ptr<EventHandler> AppfreezeInner::appMainHandler_;
 std::shared_ptr<AppfreezeInner> AppfreezeInner::instance_ = nullptr;

frameworks/native/insight_intent/insight_intent_context/BUILD.gn

@@ -43,7 +43,6 @@ ohos_shared_library("insightintentcontext") {
   external_deps = [
     "ability_base:want",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",

frameworks/native/runtime/ohos_js_environment_impl.cpp

@@ -15,8 +15,8 @@
 
 #include "ohos_js_environment_impl.h"
 
-#include "commonlibrary/ets_utils/js_sys_module/console/console.h"
-#include "commonlibrary/ets_utils/js_sys_module/timer/timer.h"
+#include "console.h"
+#include "timer.h"
 #include "hilog_tag_wrapper.h"
 #include "js_utils.h"
 #include "js_worker.h"
@@ -113,7 +113,7 @@ void OHOSJsEnvironmentImpl::InitTimerModule(NativeEngine* engine)
 {
     TAG_LOGD(AAFwkTag::JSRUNTIME, "called");
     CHECK_POINTER(engine);
-    auto ret = JsSysModule::Timer::RegisterTime(reinterpret_cast<napi_env>(engine));
+    auto ret = OHOS::JsSysModule::Timer::RegisterTime(reinterpret_cast<napi_env>(engine));
     if (!ret) {
         TAG_LOGE(AAFwkTag::JSRUNTIME, "Register timer failed");
     }

frameworks/simulator/BUILD.gn

@@ -169,13 +169,13 @@ ohos_copy("copy_ability_simulator") {
   sources += [ out_path + "/thirdparty/bounds_checking_function/libsec_shared" +
                dylib_suffix ]
 
-  deps += [ "${ets_utils_path}/js_sys_module/timer:timer" ]
-  out_path = get_label_info("${ets_utils_path}/js_sys_module/timer:timer",
+  deps += [ "ets_utils:timer" ]
+  out_path = get_label_info("ets_utils:timer",
                             "root_out_dir")
   sources += [ out_path + "/commonlibrary/ets_utils/libtimer" + dylib_suffix ]
 
-  deps += [ "${ets_utils_path}/js_sys_module/console:console" ]
-  out_path = get_label_info("${ets_utils_path}/js_sys_module/console:console",
+  deps += [ "ets_utils:console" ]
+  out_path = get_label_info("ets_utils:console",
                             "root_out_dir")
   sources += [ out_path + "/commonlibrary/ets_utils/libconsole" + dylib_suffix ]
 

frameworks/simulator/ability_simulator/BUILD.gn

@@ -14,7 +14,7 @@
 import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/ohos.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
-import("//foundation/arkui/ace_engine/build/ace_gen_obj.gni")
+import("//build/config/components/ace_engine/ace_gen_obj.gni")
 
 es2abc_gen_abc("gen_abc_js_mock") {
   js_mock_path =

frameworks/simulator/ability_simulator/src/simulator.cpp

@@ -25,8 +25,8 @@
 #include "ability_context.h"
 #include "ability_stage_context.h"
 #include "bundle_container.h"
-#include "commonlibrary/ets_utils/js_sys_module/timer/timer.h"
-#include "commonlibrary/ets_utils/js_sys_module/console/console.h"
+#include "timer.h"
+#include "console.h"
 #include "hilog_tag_wrapper.h"
 #include "js_ability_context.h"
 #include "js_ability_stage_context.h"

interfaces/inner_api/ability_manager/BUILD.gn

@@ -135,7 +135,6 @@ ohos_shared_library("ability_manager") {
     "bundle_framework:libappexecfwk_common",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
@@ -271,7 +270,6 @@ ohos_shared_library("ability_manager_c") {
   external_deps = [
     "ability_base:session_info",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "image_framework:image_native",
     "ipc:ipc_core",
     "ipc:ipc_napi",

interfaces/inner_api/app_manager/src/appmgr/ams_mgr_proxy.cpp

@@ -60,21 +60,21 @@ bool AmsMgrProxy::WriteInterfaceToken(MessageParcel &data)
     return true;
 }
 namespace {
-// bool WriteTokenObject(MessageParcel &data, sptr<IRemoteObject> token)
-// {
-//     if (token) {
-//         if (!data.WriteBool(true) || !data.WriteRemoteObject(token)) {
-//             TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag or token");
-//             return false;
-//         }
-//     } else {
-//         if (!data.WriteBool(false)) {
-//             TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag");
-//             return false;
-//         }
-//     }
-//     return true;
-// }
+bool WriteTokenObject(MessageParcel &data, sptr<IRemoteObject> token)
+{
+    if (token) {
+        if (!data.WriteBool(true) || !data.WriteRemoteObject(token)) {
+            TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag or token");
+            return false;
+        }
+    } else {
+        if (!data.WriteBool(false)) {
+            TAG_LOGE(AAFwkTag::APPMGR, "Failed to write flag");
+            return false;
+        }
+    }
+    return true;
+}
 }
 
 void AmsMgrProxy::LoadAbility(const std::shared_ptr<AbilityInfo> &abilityInfo,

interfaces/inner_api/child_process_manager/BUILD.gn

@@ -52,7 +52,6 @@ ohos_shared_library("child_process_manager") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "eventhandler:libeventhandler",
     "hilog:libhilog",
     "init:libbegetutil",

interfaces/inner_api/error_utils/BUILD.gn

@@ -38,7 +38,6 @@ ohos_shared_library("ability_runtime_error_util") {
 
   external_deps = [
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "napi:ace_napi",
   ]

interfaces/inner_api/quick_fix/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//build/ohos.gni")
 import("//foundation/ability/ability_runtime/ability_runtime.gni")
-import("//foundation/ability/idl_tool/idl_config.gni")
+import("//build/config/components/idl_tool/idl.gni")
 
 idl_interface_sources = [
   "${target_gen_dir}/quick_fix_manager_proxy.cpp",

interfaces/inner_api/runtime/BUILD.gn

@@ -103,6 +103,7 @@ ohos_shared_library("runtime") {
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "ets_runtime:libark_jsruntime",
+    "ets_utils:console",
     "ets_utils:timer",
     "eventhandler:libeventhandler",
     "ffrt:libffrt",

interfaces/inner_api/wantagent/BUILD.gn

@@ -72,7 +72,6 @@ ohos_shared_library("wantagent_innerkits") {
   external_deps = [
     "ability_base:want",
     "c_utils:utils",
-    "ets_runtime:libark_jsruntime",
     "hilog:libhilog",
     "hitrace:hitrace_meter",
     "ipc:ipc_core",

interfaces/kits/native/ability/ability_runtime/authorization_result.h

@@ -17,7 +17,7 @@
 #define OHOS_ABILITY_RUNTIME_AUTHORIZATION_RESULT_H
 
 #include "ability_context.h"
-#include "base/security/access_token/interfaces/innerkits/token_callback/include/token_callback_stub.h"
+#include "token_callback_stub.h"
 
 namespace OHOS {
 namespace AbilityRuntime {

js_environment/frameworks/js_environment/src/js_environment.cpp

@@ -20,7 +20,7 @@
 #include "js_environment_impl.h"
 #include "native_engine/impl/ark/ark_native_engine.h"
 #include "uncaught_exception_callback.h"
-#include "commonlibrary/ets_utils/js_sys_module/console/console.h"
+#include "console.h"
 
 namespace OHOS {
 namespace JsEnv {

services/abilitymgr/include/dlp_utils.h

@@ -109,24 +109,24 @@ using Dlp = Security::DlpPermission::DlpPermissionKit;
     return true;
 }
 
-// static bool CheckCallerIsDlpManager(const std::shared_ptr<AppExecFwk::BundleMgrHelper> &bundleManager)
-// {
-//     if (!bundleManager) {
-//         return false;
-//     }
+static bool CheckCallerIsDlpManager(const std::shared_ptr<AppExecFwk::BundleMgrHelper> &bundleManager)
+{
+    if (!bundleManager) {
+        return false;
+    }
 
-//     std::string bundleName;
-//     auto callerUid = IPCSkeleton::GetCallingUid();
-//     if (IN_PROCESS_CALL(bundleManager->GetNameForUid(callerUid, bundleName)) != ERR_OK) {
-//         TAG_LOGW(AAFwkTag::ABILITYMGR, "Get Bundle Name failed");
-//         return false;
-//     }
-//     if (bundleName != "com.ohos.dlpmanager") {
-//         TAG_LOGW(AAFwkTag::ABILITYMGR, "Wrong Caller");
-//         return false;
-//     }
-//     return true;
-// }
+    std::string bundleName;
+    auto callerUid = IPCSkeleton::GetCallingUid();
+    if (IN_PROCESS_CALL(bundleManager->GetNameForUid(callerUid, bundleName)) != ERR_OK) {
+        TAG_LOGW(AAFwkTag::ABILITYMGR, "Get Bundle Name failed");
+        return false;
+    }
+    if (bundleName != "com.ohos.dlpmanager") {
+        TAG_LOGW(AAFwkTag::ABILITYMGR, "Wrong Caller");
+        return false;
+    }
+    return true;
+}
 
 }  // namespace DlpUtils
 }  // namespace AAFwk

services/abilitymgr/src/ability_cache_manager.cpp

@@ -41,7 +41,7 @@ void AbilityCacheManager::Init(uint32_t devCapacity, uint32_t procCapacity)
 void AbilityCacheManager::RemoveAbilityRecInDevList(std::shared_ptr<AbilityRecord> abilityRecord)
 {
     auto it = devRecLru_.begin();
-    // uint32_t accessTokenId = abilityRecord->GetApplicationInfo().accessTokenId;
+    uint32_t accessTokenId = abilityRecord->GetApplicationInfo().accessTokenId;
     while (it != devRecLru_.end()) {
         if ((*it)->GetRecordId() == abilityRecord->GetRecordId()) {
             devRecLru_.erase(it);

services/abilitymgr/src/ability_connect_manager.cpp

@@ -38,11 +38,11 @@
 namespace OHOS {
 namespace AAFwk {
 namespace {
-// constexpr char EVENT_KEY_UID[] = "UID";
-// constexpr char EVENT_KEY_PID[] = "PID";
-// constexpr char EVENT_KEY_MESSAGE[] = "MSG";
-// constexpr char EVENT_KEY_PACKAGE_NAME[] = "PACKAGE_NAME";
-// constexpr char EVENT_KEY_PROCESS_NAME[] = "PROCESS_NAME";
+constexpr char EVENT_KEY_UID[] = "UID";
+constexpr char EVENT_KEY_PID[] = "PID";
+constexpr char EVENT_KEY_MESSAGE[] = "MSG";
+constexpr char EVENT_KEY_PACKAGE_NAME[] = "PACKAGE_NAME";
+constexpr char EVENT_KEY_PROCESS_NAME[] = "PROCESS_NAME";
 const std::string DEBUG_APP = "debugApp";
 const std::string FRS_APP_INDEX = "ohos.extra.param.key.frs_index";
 const std::string FRS_BUNDLE_NAME = "com.ohos.formrenderservice";

services/abilitymgr/src/ability_manager_service.cpp

@@ -130,18 +130,9 @@ constexpr const char* PREPARE_TERMINATE_ENABLE_PARAMETER = "persist.sys.prepare_
 // UIExtension type
 constexpr const char* UIEXTENSION_TYPE_KEY = "ability.want.params.uiExtensionType";
 constexpr const char* UIEXTENSION_TARGET_TYPE_KEY = "ability.want.params.uiExtensionTargetType";
-<<<<<<< HEAD
-// constexpr const char* SYSTEM_SHARE = "share";
-// constexpr const char* SYSTEM_SHARE_TYPE = "sysPicker/share";
 // Share picker params
 constexpr char SHARE_PICKER_DIALOG_BUNDLE_NAME_KEY[] = "const.system.sharePicker.bundleName";
 constexpr char SHARE_PICKER_DIALOG_ABILITY_NAME_KEY[] = "const.system.sharePicker.abilityName";
-// constexpr char SHARE_PICKER_UIEXTENSION_NAME_KEY[] = "const.system.sharePicker.UIExtensionAbilityName";
-=======
-// Share picker params
-constexpr char SHARE_PICKER_DIALOG_BUNDLE_NAME_KEY[] = "const.system.sharePicker.bundleName";
-constexpr char SHARE_PICKER_DIALOG_ABILITY_NAME_KEY[] = "const.system.sharePicker.abilityName";
->>>>>>> upstream/master
 constexpr char SHARE_PICKER_DIALOG_DEFAULY_BUNDLE_NAME[] = "com.ohos.sharepickerdialog";
 constexpr char SHARE_PICKER_DIALOG_DEFAULY_ABILITY_NAME[] = "PickerDialog";
 constexpr char TOKEN_KEY[] = "ohos.ability.params.token";
@@ -149,10 +140,10 @@ constexpr char TOKEN_KEY[] = "ohos.ability.params.token";
 constexpr char DEVELOPER_MODE_STATE[] = "const.security.developermode.state";
 constexpr char PRODUCT_APPBOOT_SETTING_ENABLED[] = "const.product.appboot.setting.enabled";
 // Broker params key
-// constexpr const char* KEY_VISIBLE_ID = "ohos.anco.param.visible";
+constexpr const char* KEY_VISIBLE_ID = "ohos.anco.param.visible";
 constexpr const char* START_ABILITY_TYPE = "ABILITY_INNER_START_WITH_ACCOUNT";
 constexpr const char* BUNDLE_NAME_DIALOG = "com.ohos.amsdialog";
-// constexpr const char* STR_PHONE = "phone";
+constexpr const char* STR_PHONE = "phone";
 constexpr const char* PARAM_RESV_ANCO_CALLER_UID = "ohos.anco.param.callerUid";
 constexpr const char* PARAM_RESV_ANCO_CALLER_BUNDLENAME = "ohos.anco.param.callerBundleName";
 // Distributed continued session Id
@@ -177,7 +168,7 @@ constexpr const char* FOUNDATION_PROCESS_NAME = "foundation";
 constexpr const char* RSS_PROCESS_NAME = "resource_schedule_service";
 constexpr const char* IS_PRELOAD_UIEXTENSION_ABILITY = "ability.want.params.is_preload_uiextension_ability";
 constexpr const char* UIEXTENSION_MODAL_TYPE = "ability.want.params.modalType";
-// constexpr const char* SUPPORT_CLOSE_ON_BLUR = "supportCloseOnBlur";
+constexpr const char* SUPPORT_CLOSE_ON_BLUR = "supportCloseOnBlur";
 constexpr const char* ATOMIC_SERVICE_PREFIX = "com.atomicservice.";
 constexpr const char* PARAM_SPECIFIED_PROCESS_FLAG = "ohosSpecifiedProcessFlag";
 constexpr const char* CALLER_REQUEST_CODE = "ohos.extra.param.key.callerRequestCode";
@@ -230,7 +221,7 @@ constexpr int32_t ACCOUNT_MGR_SERVICE_UID = 3058;
 constexpr int32_t DMS_UID = 5522;
 constexpr int32_t BOOTEVENT_COMPLETED_DELAY_TIME = 1000;
 constexpr int32_t BOOTEVENT_BOOT_ANIMATION_READY_SIZE = 6;
-// constexpr const char* BUNDLE_NAME_KEY = "bundleName";
+constexpr const char* BUNDLE_NAME_KEY = "bundleName";
 constexpr const char* DM_PKG_NAME = "ohos.distributedhardware.devicemanager";
 constexpr const char* ACTION_CHOOSE = "ohos.want.action.select";
 constexpr const char* HIGHEST_PRIORITY_ABILITY_ENTITY = "flag.home.intent.from.system";
@@ -4442,11 +4433,11 @@ void AbilityManagerService::NotifyCompleteContinuation(const std::string &device
         TAG_LOGE(AAFwkTag::ABILITYMGR, "failed get bms");
         return;
     }
-    // int32_t callerUid = IPCSkeleton::GetCallingUid();
+    int32_t callerUid = IPCSkeleton::GetCallingUid();
     std::string callerBundleName;
     // reset ipc identity
     auto identity = IPCSkeleton::ResetCallingIdentity();
-    // bool result = bundleMgr->GetBundleNameForUid(callerUid, callerBundleName);
+    bool result = bundleMgr->GetBundleNameForUid(callerUid, callerBundleName);
     // set ipc identity to raw
     IPCSkeleton::SetCallingIdentity(identity);
     TAG_LOGI(AAFwkTag::ABILITYMGR, "callerBundleName: %{public}s", callerBundleName.c_str());
@@ -9737,7 +9728,7 @@ bool AbilityManagerService::CheckUIExtensionCallerPidByHostWindowId(const Abilit
     CHECK_POINTER_AND_RETURN(sceneSessionManager, false);
     pid_t hostPid = 0;
     // If host window id is scb, it will return with error.
-    // auto ret = sceneSessionManager->CheckWindowId(hostWindowId, hostPid);
+    auto ret = sceneSessionManager->CheckWindowId(hostWindowId, hostPid);
     TAG_LOGD(AAFwkTag::UI_EXT, "get pid %{public}d by windowId %{public}d", hostPid, hostWindowId);
     if (hostPid != 0 && callerAbility->GetPid() == hostPid) {
         return true;

services/abilitymgr/src/free_install_manager.cpp

@@ -261,7 +261,7 @@ void FreeInstallManager::NotifyFreeInstallResult(int32_t recordId, const Want &w
         return;
     }
 
-    // bool isFromRemote = want.GetBoolParam(FROM_REMOTE_KEY, false);
+    bool isFromRemote = want.GetBoolParam(FROM_REMOTE_KEY, false);
     for (auto it = freeInstallList_.begin(); it != freeInstallList_.end();) {
         FreeInstallInfo &freeInstallInfo = *it;
         std::string bundleName = freeInstallInfo.want.GetElement().GetBundleName();

services/abilitymgr/src/insight_intent_execute_param.cpp

@@ -83,12 +83,12 @@ bool InsightIntentExecuteParam::GenerateFromWant(const AAFwk::Want &want,
         return false;
     }
     uint64_t insightIntentId = 0;
-    // try {
-    //     insightIntentId = std::stoull(wantParams.GetStringParam(INSIGHT_INTENT_EXECUTE_PARAM_ID));
-    // } catch (...) {
-    //     TAG_LOGE(AAFwkTag::ABILITY, "invalid insight intent ID");
-    //     return false;
-    // }
+    try {
+        insightIntentId = std::stoull(wantParams.GetStringParam(INSIGHT_INTENT_EXECUTE_PARAM_ID));
+    } catch (...) {
+        TAG_LOGE(AAFwkTag::ABILITY, "invalid insight intent ID");
+        return false;
+    }
 
     AppExecFwk::ElementName elementName = want.GetElement();
     executeParam.bundleName_ = elementName.GetBundleName();

services/abilitymgr/src/interceptor/disposed_rule_interceptor.cpp

@@ -28,7 +28,7 @@ constexpr const char* UNREGISTER_EVENT_TASK = "unregister event task";
 constexpr const char* UNREGISTER_TIMEOUT_OBSERVER_TASK = "unregister timeout observer task";
 constexpr int UNREGISTER_OBSERVER_MICRO_SECONDS = 5000;
 constexpr const char* UIEXTENSION_MODAL_TYPE = "ability.want.params.modalType";
-// constexpr const char* INTERCEPT_PARAMETERS = "intercept_parammeters";
+constexpr const char* INTERCEPT_PARAMETERS = "intercept_parammeters";
 constexpr const char* INTERCEPT_BUNDLE_NAME = "intercept_bundleName";
 constexpr const char* INTERCEPT_ABILITY_NAME = "intercept_abilityName";
 constexpr const char* INTERCEPT_MODULE_NAME = "intercept_moduleName";

services/abilitymgr/src/mission/mission_list_manager.cpp

@@ -45,11 +45,11 @@ namespace {
 constexpr uint32_t DELAY_NOTIFY_LABEL_TIME = 30; // 30ms
 constexpr uint32_t SCENE_FLAG_KEYGUARD = 1;
 constexpr uint32_t ONLY_ONE_ABILITY = 1;
-// constexpr const char* EVENT_KEY_UID = "UID";
-// constexpr const char* EVENT_KEY_PID = "PID";
-// constexpr const char* EVENT_KEY_MESSAGE = "MSG";
-// constexpr const char* EVENT_KEY_PACKAGE_NAME = "PACKAGE_NAME";
-// constexpr const char* EVENT_KEY_PROCESS_NAME = "PROCESS_NAME";
+constexpr const char* EVENT_KEY_UID = "UID";
+constexpr const char* EVENT_KEY_PID = "PID";
+constexpr const char* EVENT_KEY_MESSAGE = "MSG";
+constexpr const char* EVENT_KEY_PACKAGE_NAME = "PACKAGE_NAME";
+constexpr const char* EVENT_KEY_PROCESS_NAME = "PROCESS_NAME";
 constexpr int32_t SINGLE_MAX_INSTANCE_COUNT = 128;
 constexpr int32_t MAX_INSTANCE_COUNT = 512;
 constexpr uint64_t NANO_SECOND_PER_SEC = 1000000000; // ns

services/abilitymgr/src/rdb/ability_resident_process_rdb.cpp

@@ -60,7 +60,7 @@ int32_t AmsResidentProcessRdbCallBack::OnCreate(NativeRdb::RdbStore &rdbStore)
         valuesBuckets.emplace_back(valuesBucket);
     }
 
-    // int64_t rowId = -1;
+    int64_t rowId = -1;
     int64_t insertNum = 0;
     int32_t ret = rdbStore.BatchInsert(insertNum, rdbConfig_.tableName, valuesBuckets);
     if (ret != NativeRdb::E_OK) {

services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp

@@ -50,7 +50,7 @@ constexpr int KILL_TIMEOUT_MULTIPLE = 45;
 #else
 constexpr int KILL_TIMEOUT_MULTIPLE = 3;
 #endif
-// constexpr int32_t DEFAULT_USER_ID = 0;
+constexpr int32_t DEFAULT_USER_ID = 0;
 constexpr int32_t MAX_FIND_UIEXTENSION_CALLER_TIMES = 10;
 
 FreezeUtil::TimeoutState MsgId2State(uint32_t msgId)
@@ -1991,7 +1991,7 @@ void UIAbilityLifecycleManager::SetRevicerInfo(const AbilityRequest &abilityRequ
     auto isStandard = abilityInfo.launchMode == AppExecFwk::LaunchMode::STANDARD && !abilityRequest.startRecent;
     if (isStandard && abilityRequest.sessionInfo != nullptr) {
         // Support standard launch type.
-        // auto persistentId = abilityRequest.sessionInfo->persistentId;
+        auto persistentId = abilityRequest.sessionInfo->persistentId;
         abilityName += std::to_string(abilityRequest.sessionInfo->persistentId);
     }
 

services/appmgr/src/ams_mgr_scheduler.cpp

@@ -35,13 +35,13 @@ constexpr const char* TASK_TERMINATE_ABILITY = "TerminateAbilityTask";
 constexpr const char* TASK_UPDATE_ABILITY_STATE = "UpdateAbilityStateTask";
 constexpr const char* TASK_UPDATE_EXTENSION_STATE = "UpdateExtensionStateTask";
 constexpr const char* TASK_REGISTER_APP_STATE_CALLBACK = "RegisterAppStateCallbackTask";
-// constexpr const char* TASK_STOP_ALL_PROCESS = "StopAllProcessTask";
-// constexpr const char* TASK_ABILITY_BEHAVIOR_ANALYSIS = "AbilityBehaviorAnalysisTask";
+constexpr const char* TASK_STOP_ALL_PROCESS = "StopAllProcessTask";
+constexpr const char* TASK_ABILITY_BEHAVIOR_ANALYSIS = "AbilityBehaviorAnalysisTask";
 constexpr const char* TASK_KILL_PROCESS_BY_ABILITY_TOKEN = "KillProcessByAbilityTokenTask";
 constexpr const char* TASK_KILL_PROCESSES_BY_USERID = "KillProcessesByUserIdTask";
 constexpr const char* TASK_KILL_PROCESSES_BY_PIDS = "KillProcessesByPids";
 constexpr const char* TASK_ATTACH_PID_TO_PARENT = "AttachPidToParent";
-// constexpr const char* TASK_KILL_APPLICATION = "KillApplicationTask";
+constexpr const char* TASK_KILL_APPLICATION = "KillApplicationTask";
 constexpr const char* TASK_CLEAR_PROCESS_BY_ABILITY_TOKEN = "ClearProcessByAbilityTokenTask";
 constexpr const char* FOUNDATION_NAME = "foundation";
 constexpr const char* SCENE_BOARD_BUNDLE_NAME = "com.ohos.sceneboard";

services/appmgr/src/app_mgr_service.cpp

@@ -34,7 +34,7 @@
 #include "permission_constants.h"
 #include "permission_verification.h"
 #include "system_ability_definition.h"
-#include "base/security/access_token/interfaces/innerkits/accesstoken/include/accesstoken_kit.h"
+#include "accesstoken_kit.h"
 #include "app_mgr_service_const.h"
 #include "app_mgr_service_dump_error_code.h"
 #include "cache_process_manager.h"
@@ -60,11 +60,6 @@ constexpr const char* TASK_APPLICATION_FOREGROUNDED = "ApplicationForegroundedTa
 constexpr const char* TASK_APPLICATION_BACKGROUNDED = "ApplicationBackgroundedTask";
 constexpr const char* TASK_APPLICATION_TERMINATED = "ApplicationTerminatedTask";
 constexpr const char* TASK_ABILITY_CLEANED = "AbilityCleanedTask";
-<<<<<<< HEAD
-// constexpr const char* TASK_ADD_APP_DEATH_RECIPIENT = "AddAppRecipientTask";
-// constexpr const char* TASK_CLEAR_UP_APPLICATION_DATA = "ClearUpApplicationDataTask";
-=======
->>>>>>> upstream/master
 constexpr const char* TASK_STARTUP_RESIDENT_PROCESS = "StartupResidentProcess";
 constexpr const char* TASK_ADD_ABILITY_STAGE_DONE = "AddAbilityStageDone";
 constexpr const char* TASK_START_USER_TEST_PROCESS = "StartUserTestProcess";

services/appmgr/src/app_mgr_service_inner.cpp

@@ -144,7 +144,7 @@ constexpr int KILL_PROCESS_TIMEOUT_MICRO_SECONDS = 1000;
 constexpr int KILL_PROCESS_DELAYTIME_MICRO_SECONDS = 200;
 // delay register focus listener to wms
 constexpr int REGISTER_FOCUS_DELAY = 5000;
-// constexpr int REGISTER_VISIBILITY_DELAY = 5000;
+constexpr int REGISTER_VISIBILITY_DELAY = 5000;
 constexpr int REGISTER_PID_VISIBILITY_DELAY = 5000;
 // Max render process number limitation for phone device.
 constexpr int PHONE_MAX_RENDER_PROCESS_NUM = 40;
@@ -152,8 +152,8 @@ constexpr int PROCESS_RESTART_MARGIN_MICRO_SECONDS = 2000;
 constexpr const int32_t API10 = 10;
 constexpr const int32_t API_VERSION_MOD = 100;
 constexpr const int32_t U0_USER_ID = 0;
-// constexpr const char* CLASS_NAME = "ohos.app.MainThread";
-// constexpr const char* FUNC_NAME = "main";
+constexpr const char* CLASS_NAME = "ohos.app.MainThread";
+constexpr const char* FUNC_NAME = "main";
 constexpr const char* RENDER_PARAM = "invalidparam";
 constexpr const char* COLD_START = "coldStart";
 constexpr const char* PERF_CMD = "perfCmd";
@@ -208,9 +208,9 @@ constexpr ErrCode APPMGR_ERR_OFFSET = ErrCodeOffset(SUBSYS_APPEXECFWK, 0x01);
 constexpr ErrCode ERR_ALREADY_EXIST_RENDER = APPMGR_ERR_OFFSET + 100;
  // Error code for reaching render process number limitation.
 constexpr ErrCode ERR_REACHING_MAXIMUM_RENDER_PROCESS_LIMITATION = APPMGR_ERR_OFFSET + 101;
-// constexpr const char* EVENT_KEY_UID = "UID";
+constexpr const char* EVENT_KEY_UID = "UID";
 constexpr const char* EVENT_KEY_PID = "PID";
-// constexpr const char* EVENT_KEY_PACKAGE_NAME = "PACKAGE_NAME";
+constexpr const char* EVENT_KEY_PACKAGE_NAME = "PACKAGE_NAME";
 constexpr const char* EVENT_KEY_PROCESS_NAME = "PROCESS_NAME";
 constexpr const char* EVENT_KEY_MESSAGE = "MSG";
 
@@ -232,7 +232,7 @@ constexpr const char* SUPPORT_CALL_NOTIFY_MEMORY_CHANGED =
 
 constexpr const char* SYSTEM_BASIC = "system_basic";
 constexpr const char* SYSTEM_CORE = "system_core";
-// constexpr const char* ABILITY_OWNER_USERID = "AbilityMS_Owner_UserId";
+constexpr const char* ABILITY_OWNER_USERID = "AbilityMS_Owner_UserId";
 constexpr const char* PROCESS_EXIT_EVENT_TASK = "Send Process Exit Event Task";
 constexpr const char* KILL_PROCESS_REASON_PREFIX = "Kill Reason:";
 constexpr const char* PRELOAD_APPLIATION_TASK = "PreloadApplicactionTask";
@@ -7925,7 +7925,7 @@ bool AppMgrServiceInner::IsKilledForUpgradeWeb(const std::string &bundleName) co
 
 void AppMgrServiceInner::GetPidsByAccessTokenId(const uint32_t accessTokenId, std::vector<pid_t> &pids)
 {
-    // int32_t result = ERR_OK;
+    int32_t result = ERR_OK;
     pid_t foregroundPid = -1;
     for (const auto &item : appRunningManager_->GetAppRunningRecordMap()) {
         const auto &appRecord = item.second;