openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

update frameworks/js/napi/app/app_manager/js_app_manager.cpp.

Browse Source 
Signed-off-by: wanglai.yao <yaowanglai@huawei.com>
This commit is contained in:
wanglai.yao
2024-06-20 08:13:24 +00:00
committed by Gitee
parent 6e1176ba74
commit 4236eb7eb1
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/js/napi/app/app_manager/js_app_manager.cpp
+11 -9
View File
@@ -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 {