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

childProcessManager 401修改

Browse Source 
Signed-off-by: zhangyuhang72 <zhangyuhang72@huawei.com>
Change-Id: I9775bfe36c58a5d75db5d13d5c58f67b905f46eb
This commit is contained in:
zhangyuhang72
2024-04-16 22:12:35 +08:00
parent 70dea49763
commit 818b2866e1
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/js/napi/js_child_process_manager/js_child_process_manager.cpp
+7 -4
View File
@@ -72,18 +72,20 @@ private:
int32_t startMode;
if (!ConvertFromJsValue(env, argv[0], srcEntry)) {
TAG_LOGE(AAFwkTag::PROCESSMGR, "Parse param srcEntry failed");
ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM);
ThrowInvalidParamError(env, "Parse param srcEntry failed, must be a valid string.");
return CreateJsUndefined(env);
}
if (!ConvertFromJsValue(env, argv[1], startMode)) {
TAG_LOGE(AAFwkTag::PROCESSMGR, "Parse param startMode failed");
ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM);
ThrowInvalidParamError(env,
"Unsupported startMode, must be StartMode.SELF_FORK or StartMode.APP_SPAWN_FORK.");
return CreateJsUndefined(env);
}
TAG_LOGD(AAFwkTag::PROCESSMGR, "StartMode: %{public}d", startMode);
if (startMode != MODE_SELF_FORK && startMode != MODE_APP_SPAWN_FORK) {
TAG_LOGE(AAFwkTag::PROCESSMGR, "Not supported StartMode");
ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM);
ThrowInvalidParamError(env,
"Unsupported startMode, must be StartMode.SELF_FORK or StartMode.APP_SPAWN_FORK.");
return CreateJsUndefined(env);
}
NapiAsyncTask::CompleteCallback complete = [srcEntry, startMode](napi_env env, NapiAsyncTask &task,
@@ -113,7 +115,8 @@ private:
}
default: {
TAG_LOGE(AAFwkTag::PROCESSMGR, "Not supported StartMode");
task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM));
task.Reject(env, CreateInvalidParamJsError(env,
"Unsupported startMode,must be StartMode.SELF_FORK or StartMode.APP_SPAWN_FORK."));
return;
}
}
frameworks/native/runtime/js_error_utils.cpp
+10
View File
@@ -64,6 +64,11 @@ void ThrowNoPermissionError(napi_env env, const std::string& permission)
GetNoPermissionErrorMsg(permission)));
}
void ThrowInvalidParamError(napi_env env, const std::string &message)
{
napi_throw(env, CreateInvalidParamJsError(env, message));
}
void ThrowErrorByNativeErr(napi_env env, int32_t err)
{
napi_throw(env, CreateJsErrorByNativeErr(env, err));
@@ -74,6 +79,11 @@ napi_value CreateJsError(napi_env env, const AbilityErrorCode& err)
return CreateJsError(env, static_cast<int32_t>(err), GetErrorMsg(err));
}
napi_value CreateInvalidParamJsError(napi_env env, const std::string &message)
{
return CreateJsError(env, static_cast<int32_t>(AbilityErrorCode::ERROR_CODE_INVALID_PARAM), message);
}
napi_value CreateNoPermissionError(napi_env env, const std::string& permission)
{
return CreateJsError(env,
interfaces/inner_api/runtime/include/js_error_utils.h
+2
View File
@@ -28,9 +28,11 @@ void ThrowInvaildCallerError(napi_env env);
void ThrowTooFewParametersError(napi_env env);
void ThrowInvalidNumParametersError(napi_env env);
void ThrowNoPermissionError(napi_env env, const std::string& permission);
void ThrowInvalidParamError(napi_env env, const std::string &message);
void ThrowErrorByNativeErr(napi_env env, int32_t err);
napi_value CreateJsError(napi_env env, const AbilityErrorCode& err);
napi_value CreateInvalidParamJsError(napi_env env, const std::string &message);
napi_value CreateNoPermissionError(napi_env env, const std::string& permission);
napi_value CreateJsErrorByNativeErr(napi_env env, int32_t err, const std::string& permission = "");
} // namespace AbilityRuntime