From 4236eb7eb16cc262dd0bbcb472cb5ff5304bb3cf Mon Sep 17 00:00:00 2001
From: "wanglai.yao" <yaowanglai@huawei.com>
Date: Thu, 20 Jun 2024 08:13:24 +0000
Subject: [PATCH] update frameworks/js/napi/app/app_manager/js_app_manager.cpp.

Signed-off-by: wanglai.yao <yaowanglai@huawei.com>
---
 .../napi/app/app_manager/js_app_manager.cpp   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/frameworks/js/napi/app/app_manager/js_app_manager.cpp b/frameworks/js/napi/app/app_manager/js_app_manager.cpp
index 3b915cd473..ddc7e4d8c5 100644
--- a/frameworks/js/napi/app/app_manager/js_app_manager.cpp
+++ b/frameworks/js/napi/app/app_manager/js_app_manager.cpp
@@ -354,7 +354,8 @@ private:
         napi_value lastParam = (argc == ARGC_TWO && !hasClearPageStack) ? argv[INDEX_ONE] : nullptr;
         napi_value result = nullptr;
         std::unique_ptr<NapiAsyncTask> napiAsyncTask = CreateEmptyAsyncTask(env, lastParam, &result);
-        auto asyncTask = [bundleName, abilityManager = abilityManager_, errCode, env, task = napiAsyncTask.get()]() {
+        auto asyncTask = [bundleName, clearPageStack, abilityManager = abilityManager_, errCode,
+            env, task = napiAsyncTask.get()]() {
             if (errCode != 0) {
                 task->Reject(env, CreateJsError(env, errCode, "Invalidate params."));
                 return;
@@ -364,7 +365,7 @@ private:
                 task->Reject(env, CreateJsError(env, ERROR_CODE_ONE, "abilityManager nullptr"));
                 return;
             }
-            auto ret = abilityManager->KillProcess(bundleName);
+            auto ret = abilityManager->KillProcess(bundleName, clearPageStack);
             if (ret == 0) {
                 task->Resolve(env, CreateJsValue(env, ret));
             } else {
@@ -401,17 +402,17 @@ private:
         napi_value lastParam = (argc == ARGC_TWO) ? argv[INDEX_ONE] : nullptr;
         napi_value result = nullptr;
         std::unique_ptr<NapiAsyncTask> napiAsyncTask = CreateEmptyAsyncTask(env, lastParam, &result);
-        auto asyncTask = [bundleName, abilityManager = abilityManager_, errCode, env, task = napiAsyncTask.get()]() {
+        auto asyncTask = [bundleName, appManager = appManager_, errCode, env, task = napiAsyncTask.get()]() {
             if (errCode != 0) {
                 task->Reject(env, CreateJsError(env, errCode, "Invalidate params."));
                 return;
             }
-            if (abilityManager == nullptr) {
-                TAG_LOGW(AAFwkTag::APPMGR, "abilityManager nullptr");
-                task->Reject(env, CreateJsError(env, ERROR_CODE_ONE, "abilityManager nullptr"));
+            if (appManager == nullptr) {
+                TAG_LOGW(AAFwkTag::APPMGR, "appManager nullptr");
+                task->Reject(env, CreateJsError(env, ERROR_CODE_ONE, "appManager nullptr"));
                 return;
             }
-            auto ret = abilityManager->ClearUpApplicationData(bundleName);
+            auto ret = appManager->ClearUpApplicationData(bundleName, 0);
             if (ret == 0) {
                 task->Resolve(env, CreateJsValue(env, ret));
             } else {
@@ -462,12 +463,13 @@ private:
          napi_value lastParam = (argc == ARGC_THREE) ? argv[INDEX_TWO] : nullptr;
          napi_value result = nullptr;
         std::unique_ptr<NapiAsyncTask> napiAsyncTask = CreateEmptyAsyncTask(env, lastParam, &result);
-        auto asyncTask = [appManager = appManager_, bundleName, accountId, errCode, env, task = napiAsyncTask.get()]() {
+        auto asyncTask = [appManager = appManager_, bundleName, accountId, clearPageStack, errCode,
+            env, task = napiAsyncTask.get()]() {
             if (errCode != 0) {
                 task->Reject(env, CreateJsError(env, errCode, "Invalidate params."));
                 return;
             }
-            auto ret = appManager->GetAmsMgr()->KillProcessWithAccount(bundleName, accountId);
+            auto ret = appManager->GetAmsMgr()->KillProcessWithAccount(bundleName, accountId, clearPageStack);
             if (ret == 0) {
                 task->Resolve(env, CreateJsUndefined(env));
             } else {