diff --git a/frameworks/js/napi/ability_manager/js_ability_manager.cpp b/frameworks/js/napi/ability_manager/js_ability_manager.cpp index da6b82bd72..ef57a22846 100644 --- a/frameworks/js/napi/ability_manager/js_ability_manager.cpp +++ b/frameworks/js/napi/ability_manager/js_ability_manager.cpp @@ -208,7 +208,7 @@ private: return result; } - NativeValue* OnGetTopAbility(NativeEngine &engine, NativeCallbackInfo &info) + NativeValue* OnGetTopAbility(NativeEngine &engine, const NativeCallbackInfo &info) { HILOG_INFO("%{public}s is called", __FUNCTION__); AsyncTask::CompleteCallback complete = 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 6a142c1de3..e968ef1008 100644 --- a/frameworks/js/napi/app/app_manager/js_app_manager.cpp +++ b/frameworks/js/napi/app/app_manager/js_app_manager.cpp @@ -222,7 +222,7 @@ private: return result; } - NativeValue* OnGetForegroundApplications(NativeEngine& engine, NativeCallbackInfo& info) + NativeValue* OnGetForegroundApplications(NativeEngine& engine, const NativeCallbackInfo& info) { HILOG_INFO("%{public}s is called", __FUNCTION__); int32_t errCode = 0; diff --git a/frameworks/js/napi/app/js_app_manager/js_app_manager.cpp b/frameworks/js/napi/app/js_app_manager/js_app_manager.cpp index 60ec0660df..7717f831ad 100644 --- a/frameworks/js/napi/app/js_app_manager/js_app_manager.cpp +++ b/frameworks/js/napi/app/js_app_manager/js_app_manager.cpp @@ -145,7 +145,6 @@ private: return engine.CreateUndefined(); } - static int64_t serialNumber = 0; std::vector bundleNameList; // unwarp observer if (observer_ == nullptr) { @@ -159,6 +158,7 @@ private: if (ret == 0) { HILOG_DEBUG("RegisterApplicationStateObserver success."); std::lock_guard lock(g_observerMutex); + static int64_t serialNumber = 0; int64_t observerId = serialNumber; observer_->AddJsObserverObject(observerId, info.argv[INDEX_ZERO]); if (serialNumber < INT32_MAX) { @@ -226,7 +226,7 @@ private: return result; } - NativeValue* OnGetForegroundApplications(NativeEngine& engine, NativeCallbackInfo& info) + NativeValue* OnGetForegroundApplications(NativeEngine& engine, const NativeCallbackInfo& info) { HILOG_INFO("%{public}s is called", __FUNCTION__); AsyncTask::CompleteCallback complete = diff --git a/frameworks/js/napi/featureAbility/js_data_ability_helper.cpp b/frameworks/js/napi/featureAbility/js_data_ability_helper.cpp index 1ad8588898..e1e243ace8 100644 --- a/frameworks/js/napi/featureAbility/js_data_ability_helper.cpp +++ b/frameworks/js/napi/featureAbility/js_data_ability_helper.cpp @@ -55,7 +55,7 @@ static void OnChangeJSThreadWorker(uv_work_t *work, int status) HILOG_ERROR("OnChange, uv_queue_work input work is nullptr."); return; } - DAHelperOnOffCB *onCB = (DAHelperOnOffCB *)work->data; + DAHelperOnOffCB *onCB = static_cast(work->data); if (onCB == nullptr) { HILOG_ERROR("OnChange, uv_queue_work onCB is nullptr."); delete work; diff --git a/frameworks/js/napi/featureAbility/js_data_ability_helper.h b/frameworks/js/napi/featureAbility/js_data_ability_helper.h index d99d8c3d4d..27368002b3 100644 --- a/frameworks/js/napi/featureAbility/js_data_ability_helper.h +++ b/frameworks/js/napi/featureAbility/js_data_ability_helper.h @@ -249,11 +249,11 @@ napi_value UnRegisterWrap(napi_env env, napi_callback_info info, DAHelperOnOffCB * @brief Off Async. * * @param env The environment that the Node-API call is invoked under. - * @param insertCB Process data asynchronously. + * @param offCB Process data asynchronously. * * @return Return JS data successfully, otherwise return nullptr. */ -napi_value UnRegisterAsync(napi_env env, DAHelperOnOffCB *insertCB); +napi_value UnRegisterAsync(napi_env env, DAHelperOnOffCB *offCB); /** * @brief Off asynchronous processing function. diff --git a/frameworks/js/napi/featureAbility/napi_data_ability_operation.cpp b/frameworks/js/napi/featureAbility/napi_data_ability_operation.cpp index 4d67dea94f..2478783742 100644 --- a/frameworks/js/napi/featureAbility/napi_data_ability_operation.cpp +++ b/frameworks/js/napi/featureAbility/napi_data_ability_operation.cpp @@ -161,8 +161,8 @@ bool GetDataAbilityOperationBuilder( return true; } -napi_value UnwrapValuesBucket( - const std::shared_ptr ¶m, napi_env env, napi_value valueBucketParam) +napi_value UnwrapValuesBucket(const std::shared_ptr ¶m, napi_env env, + napi_value valueBucketParam) { HILOG_INFO("%{public}s called.", __func__); napi_value result; diff --git a/frameworks/js/napi/featureAbility/napi_data_ability_operation.h b/frameworks/js/napi/featureAbility/napi_data_ability_operation.h index d144e1233f..690f7abbea 100644 --- a/frameworks/js/napi/featureAbility/napi_data_ability_operation.h +++ b/frameworks/js/napi/featureAbility/napi_data_ability_operation.h @@ -53,11 +53,12 @@ bool GetDataAbilityOperationBuilder( * * @param param Indicates the valuesBucket parameters saved the parse result. * @param env The environment that the Node-API call is invoked under. - * @param args Indicates the arguments passed into the callback. + * @param valueBucketParam Indicates the arguments passed into the callback. * * @return The return value from NAPI C++ to JS for the module. */ -napi_value UnwrapValuesBucket(const std::shared_ptr ¶m, napi_env env, napi_value args); +napi_value UnwrapValuesBucket(const std::shared_ptr ¶m, napi_env env, + napi_value valueBucketParam); /** * @brief Parse the DataAbilityPredicatesBackReferences parameters. * diff --git a/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp b/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp index cb112bcbb6..5c19d98d3f 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp @@ -4846,6 +4846,7 @@ NativeValue* JsNapiCommon::JsConnectAbility( if (ability_ == nullptr) { errorVal = static_cast(NAPI_ERR_ACE_ABILITY); HILOG_ERROR("JsConnectAbility, the ability is nullptr"); + return engine.CreateUndefined(); } bool result = false; diff --git a/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp b/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp index 85001fd85d..63494c7c9e 100644 --- a/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp +++ b/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp @@ -286,11 +286,6 @@ NativeValue* JsAbilityContext::OnStartAbilityByCall(NativeEngine& engine, Native InheritWindowMode(want); std::shared_ptr calls = std::make_shared(); - if (calls == nullptr) { - HILOG_ERROR("calls create error"); - ThrowError(engine, AbilityErrorCode::ERROR_CODE_INNER); - return engine.CreateUndefined(); - } NativeValue* lastParam = ((info.argc == ARGC_TWO) ? info.argv[ARGC_ONE] : nullptr); NativeValue* retsult = nullptr; @@ -542,7 +537,7 @@ NativeValue* JsAbilityContext::OnStartExtensionAbility(NativeEngine& engine, Nat return result; } -NativeValue* JsAbilityContext::OnStartExtensionAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info) +NativeValue* JsAbilityContext::OnStartExtensionAbilityWithAccount(NativeEngine& engine, const NativeCallbackInfo& info) { HILOG_INFO("OnStartExtensionAbilityWithAccount is called."); if (info.argc < ARGC_TWO) { @@ -583,7 +578,7 @@ NativeValue* JsAbilityContext::OnStartExtensionAbilityWithAccount(NativeEngine& return result; } -NativeValue* JsAbilityContext::OnStopExtensionAbility(NativeEngine& engine, NativeCallbackInfo& info) +NativeValue* JsAbilityContext::OnStopExtensionAbility(NativeEngine& engine, const NativeCallbackInfo& info) { HILOG_INFO("OnStopExtensionAbility is called."); if (info.argc < ARGC_ONE) { @@ -621,7 +616,7 @@ NativeValue* JsAbilityContext::OnStopExtensionAbility(NativeEngine& engine, Nati return result; } -NativeValue* JsAbilityContext::OnStopExtensionAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info) +NativeValue* JsAbilityContext::OnStopExtensionAbilityWithAccount(NativeEngine& engine, const NativeCallbackInfo& info) { HILOG_INFO("OnStartExtensionAbilityWithAccount is called."); if (info.argc < ARGC_TWO) { diff --git a/frameworks/native/ability/native/js_service_extension_context.cpp b/frameworks/native/ability/native/js_service_extension_context.cpp index 8de3d8df27..8a06863f47 100644 --- a/frameworks/native/ability/native/js_service_extension_context.cpp +++ b/frameworks/native/ability/native/js_service_extension_context.cpp @@ -216,12 +216,6 @@ private: } std::shared_ptr calls = std::make_shared(); - if (calls == nullptr) { - HILOG_ERROR("calls create error"); - ThrowError(engine, AbilityErrorCode::ERROR_CODE_INNER); - return engine.CreateUndefined(); - } - NativeValue* retsult = nullptr; calls->callerCallBack = std::make_shared(); calls->callerCallBack->SetCallBack(GetCallBackDone(calls)); diff --git a/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h b/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h index fd78cf6d8c..8e3e35dfa4 100644 --- a/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h +++ b/interfaces/kits/native/ability/native/ability_runtime/js_ability_context.h @@ -81,9 +81,9 @@ private: NativeValue* OnStartAbilityForResult(NativeEngine& engine, NativeCallbackInfo& info); NativeValue* OnStartAbilityForResultWithAccount(NativeEngine& engine, NativeCallbackInfo& info); NativeValue* OnStartExtensionAbility(NativeEngine& engine, NativeCallbackInfo& info); - NativeValue* OnStartExtensionAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info); - NativeValue* OnStopExtensionAbility(NativeEngine& engine, NativeCallbackInfo& info); - NativeValue* OnStopExtensionAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info); + NativeValue* OnStartExtensionAbilityWithAccount(NativeEngine& engine, const NativeCallbackInfo& info); + NativeValue* OnStopExtensionAbility(NativeEngine& engine, const NativeCallbackInfo& info); + NativeValue* OnStopExtensionAbilityWithAccount(NativeEngine& engine, const NativeCallbackInfo& info); NativeValue* OnTerminateSelfWithResult(NativeEngine& engine, NativeCallbackInfo& info); NativeValue* OnConnectAbility(NativeEngine& engine, NativeCallbackInfo& info); NativeValue* OnConnectAbilityWithAccount(NativeEngine& engine, NativeCallbackInfo& info);