From 408b1dd9986f5c9ab394861265031c05bc196c92 Mon Sep 17 00:00:00 2001 From: huangshiwei Date: Tue, 15 Nov 2022 15:39:04 +0800 Subject: [PATCH] huangshiwei4@huawei.com Signed-off-by: huangshiwei --- .../js_ability_manager_utils.cpp | 12 +++++----- .../application_context_constant_module.cpp | 2 +- .../napi/featureAbility/feature_ability.cpp | 2 +- .../js/napi/featureAbility/napi_context.cpp | 22 +++++++++---------- .../feature_ability/js_feature_ability.cpp | 2 +- .../inner/napi_common/napi_common_ability.cpp | 20 ++++++++--------- .../inner/napi_common/napi_common_util.cpp | 2 +- .../napi/particleAbility/particle_ability.cpp | 2 +- .../js/napi/wantagent/napi_want_agent.cpp | 5 ++--- .../native/ability/native/ability_context.cpp | 6 ++--- .../native/ability_lifecycle_executor.cpp | 2 +- .../context/js_context_utils.cpp | 4 ++-- .../include/appmgr/app_scheduler_proxy.h | 8 +++---- .../src/appmgr/app_scheduler_proxy.cpp | 2 +- .../inner_api/wantagent/src/pending_want.cpp | 8 +++---- .../wantagent/src/want_agent_helper.cpp | 14 ++++++------ .../native/ability/native/ability_context.h | 2 +- .../native/ability_lifecycle_executor.h | 2 +- .../native/ability/native/ability_process.h | 2 +- .../abilitymgr/src/pending_want_record.cpp | 2 +- .../appstateobservermanager_fuzzer.cpp | 1 - 21 files changed, 61 insertions(+), 61 deletions(-) diff --git a/frameworks/js/napi/ability_manager/js_ability_manager_utils.cpp b/frameworks/js/napi/ability_manager/js_ability_manager_utils.cpp index 7a58c4e16e..49cf1cb203 100644 --- a/frameworks/js/napi/ability_manager/js_ability_manager_utils.cpp +++ b/frameworks/js/napi/ability_manager/js_ability_manager_utils.cpp @@ -124,11 +124,13 @@ NativeValue *AbilityStateInit(NativeEngine *engine) return nullptr; } - object->SetProperty("INITIAL", CreateJsValue(*engine, (int32_t)AAFwk::AbilityState::INITIAL)); - object->SetProperty("FOREGROUND", CreateJsValue(*engine, (int32_t)AAFwk::AbilityState::FOREGROUND)); - object->SetProperty("BACKGROUND", CreateJsValue(*engine, (int32_t)AAFwk::AbilityState::BACKGROUND)); - object->SetProperty("FOREGROUNDING", CreateJsValue(*engine, (int32_t)AAFwk::AbilityState::FOREGROUNDING)); - object->SetProperty("BACKGROUNDING", CreateJsValue(*engine, (int32_t)AAFwk::AbilityState::BACKGROUNDING)); + object->SetProperty("INITIAL", CreateJsValue(*engine, static_cast(AAFwk::AbilityState::INITIAL))); + object->SetProperty("FOREGROUND", CreateJsValue(*engine, static_cast(AAFwk::AbilityState::FOREGROUND))); + object->SetProperty("BACKGROUND", CreateJsValue(*engine, static_cast(AAFwk::AbilityState::BACKGROUND))); + object->SetProperty("FOREGROUNDING", + CreateJsValue(*engine, static_cast(AAFwk::AbilityState::FOREGROUNDING))); + object->SetProperty("BACKGROUNDING", + CreateJsValue(*engine, static_cast(AAFwk::AbilityState::BACKGROUNDING))); return objValue; } diff --git a/frameworks/js/napi/application_context_constant/application_context_constant_module.cpp b/frameworks/js/napi/application_context_constant/application_context_constant_module.cpp index da6280ec47..61dbfe159a 100644 --- a/frameworks/js/napi/application_context_constant/application_context_constant_module.cpp +++ b/frameworks/js/napi/application_context_constant/application_context_constant_module.cpp @@ -70,7 +70,7 @@ static napi_module _module = { .nm_filename = nullptr, .nm_register_func = ApplicationContextConstantInit, .nm_modname = "app.ability.contextConstant", - .nm_priv = ((void *)0), + .nm_priv = (static_cast(0)), .reserved = {0} }; diff --git a/frameworks/js/napi/featureAbility/feature_ability.cpp b/frameworks/js/napi/featureAbility/feature_ability.cpp index 2f05dd4fd6..0dcce6e43f 100644 --- a/frameworks/js/napi/featureAbility/feature_ability.cpp +++ b/frameworks/js/napi/featureAbility/feature_ability.cpp @@ -246,7 +246,7 @@ Ability* JsFeatureAbility::GetAbility(NativeEngine &engine) } Ability *ability = nullptr; - ret = napi_get_value_external(env, abilityObj, (void **)&ability); + ret = napi_get_value_external(env, abilityObj, reinterpret_cast(&ability)); if (ret != napi_ok) { napi_get_last_error_info(env, &errorInfo); HILOG_ERROR("get_value_external=%{public}d err:%{public}s", ret, errorInfo->error_message); diff --git a/frameworks/js/napi/featureAbility/napi_context.cpp b/frameworks/js/napi/featureAbility/napi_context.cpp index df788765d7..6ef9d44a36 100644 --- a/frameworks/js/napi/featureAbility/napi_context.cpp +++ b/frameworks/js/napi/featureAbility/napi_context.cpp @@ -69,7 +69,7 @@ static Ability* GetJSAbilityObject(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); return ability; } @@ -435,7 +435,7 @@ static napi_value SetWakeUpScreenWrap(napi_env env, napi_callback_info info, Set NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); cbData->cbBase.ability = ability; napi_value ret = nullptr; @@ -1220,7 +1220,7 @@ AppInfoCB *CreateAppInfoCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); AppInfoCB *appInfoCB = new (std::nothrow) AppInfoCB; if (appInfoCB == nullptr) { @@ -1488,7 +1488,7 @@ ProcessInfoCB *CreateProcessInfoCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); ProcessInfoCB *processInfoCB = new (std::nothrow) ProcessInfoCB; if (processInfoCB == nullptr) { @@ -1514,7 +1514,7 @@ ElementNameCB *CreateElementNameCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); ElementNameCB *elementNameCB = new (std::nothrow) ElementNameCB; if (elementNameCB == nullptr) { @@ -1733,7 +1733,7 @@ ProcessNameCB *CreateProcessNameCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); ProcessNameCB *processNameCB = new (std::nothrow) ProcessNameCB; if (processNameCB == nullptr) { @@ -1924,7 +1924,7 @@ CallingBundleCB *CreateCallingBundleCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); CallingBundleCB *callingBundleCB = new (std::nothrow) CallingBundleCB; if (callingBundleCB == nullptr) { @@ -2116,7 +2116,7 @@ GetOrCreateLocalDirCB *CreateGetOrCreateLocalDirCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); GetOrCreateLocalDirCB *getOrCreateLocalDirCB = new (std::nothrow) GetOrCreateLocalDirCB; if (getOrCreateLocalDirCB == nullptr) { @@ -2466,7 +2466,7 @@ DatabaseDirCB *CreateGetDatabaseDirCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); DatabaseDirCB *getDatabaseDirCB = new (std::nothrow) DatabaseDirCB; if (getDatabaseDirCB == nullptr) { @@ -2564,7 +2564,7 @@ PreferencesDirCB *CreateGetPreferencesDirCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); PreferencesDirCB *getPreferencesDirCB = new (std::nothrow) PreferencesDirCB; if (getPreferencesDirCB == nullptr) { @@ -3186,7 +3186,7 @@ bool NapiJsContext::DataInit(NativeEngine &engine) HILOG_INFO("Get Ability to start"); NAPI_CALL_BASE(env, napi_get_global(env, &global), false); NAPI_CALL_BASE(env, napi_get_named_property(env, global, "ability", &abilityObj), false); - NAPI_CALL_BASE(env, napi_get_value_external(env, abilityObj, (void **)&ability_), false); + NAPI_CALL_BASE(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability_)), false); HILOG_INFO("Get Ability to done"); return true; diff --git a/frameworks/js/napi/feature_ability/js_feature_ability.cpp b/frameworks/js/napi/feature_ability/js_feature_ability.cpp index bd46d9c91a..fd47715e51 100644 --- a/frameworks/js/napi/feature_ability/js_feature_ability.cpp +++ b/frameworks/js/napi/feature_ability/js_feature_ability.cpp @@ -311,7 +311,7 @@ Ability* JsFeatureAbility::GetAbility(napi_env env) } Ability* ability = nullptr; - ret = napi_get_value_external(env, abilityObj, (void **)&ability); + ret = napi_get_value_external(env, abilityObj, reinterpret_cast(&ability)); if (ret != napi_ok) { napi_get_last_error_info(env, &errorInfo); HILOG_ERROR("JsFeatureAbility::GetAbility, get_value_external=%{public}d err:%{public}s", 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 48b5c08620..fc4b8db41a 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_ability.cpp @@ -934,7 +934,7 @@ AppTypeCB *CreateAppTypeCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); AppTypeCB *appTypeCB = new (std::nothrow) AppTypeCB; if (appTypeCB == nullptr) { @@ -1220,7 +1220,7 @@ napi_value GetDisplayOrientationWrap(napi_env env, napi_callback_info info, Asyn } } -void GetDisplayOrientationExecuteCallback(napi_env, void *data) +void GetDisplayOrientationExecuteCallback(napi_env env, void *data) { HILOG_INFO("%{public}s called.", __func__); AsyncJSCallbackInfo *asyncCallbackInfo = static_cast(data); @@ -1309,7 +1309,7 @@ AbilityInfoCB *CreateAbilityInfoCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); AbilityInfoCB *abilityInfoCB = new (std::nothrow) AbilityInfoCB; if (abilityInfoCB == nullptr) { @@ -1718,7 +1718,7 @@ HapModuleInfoCB *CreateHapModuleInfoCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); HapModuleInfoCB *hapModuleInfoCB = new (std::nothrow) HapModuleInfoCB; if (hapModuleInfoCB == nullptr) { @@ -2048,7 +2048,7 @@ AppVersionInfoCB *CreateAppVersionInfoCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); AppVersionInfoCB *appVersionInfoCB = new (std::nothrow) AppVersionInfoCB; if (appVersionInfoCB == nullptr) { @@ -2333,7 +2333,7 @@ AsyncCallbackInfo *CreateAsyncCallbackInfo(napi_env env) } Ability *ability = nullptr; - ret = napi_get_value_external(env, abilityObj, (void **)&ability); + ret = napi_get_value_external(env, abilityObj, reinterpret_cast(&ability)); if (ret != napi_ok) { napi_get_last_error_info(env, &errorInfo); HILOG_ERROR("%{public}s get_value_external=%{public}d err:%{public}s", __func__, ret, errorInfo->error_message); @@ -2750,7 +2750,7 @@ AbilityNameCB *CreateAbilityNameCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); AbilityNameCB *abilityNameCB = new (std::nothrow) AbilityNameCB; if (abilityNameCB == nullptr) { @@ -3494,7 +3494,7 @@ ConnectAbilityCB *CreateConnectAbilityCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); ConnectAbilityCB *connectAbilityCB = new (std::nothrow) ConnectAbilityCB; if (connectAbilityCB == nullptr) { @@ -3759,7 +3759,7 @@ ConnectAbilityCB *CreateDisConnectAbilityCBInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); ConnectAbilityCB *connectAbilityCB = new (std::nothrow) ConnectAbilityCB; if (connectAbilityCB == nullptr) { @@ -4339,7 +4339,7 @@ napi_value UnwrapParamForWantAgent(napi_env &env, napi_value &args, AbilityRunti napi_get_named_property(env, args, "wantAgent", &wantAgentParam); NAPI_CALL(env, napi_typeof(env, wantAgentParam, &valuetype)); NAPI_ASSERT(env, valuetype == napi_object, "Wrong argument type. Object expected."); - napi_unwrap(env, wantAgentParam, (void **)&wantAgent); + napi_unwrap(env, wantAgentParam, reinterpret_cast(&wantAgent)); } napi_get_null(env, &result); diff --git a/frameworks/js/napi/inner/napi_common/napi_common_util.cpp b/frameworks/js/napi/inner/napi_common/napi_common_util.cpp index 630aa87f14..0564c192ae 100644 --- a/frameworks/js/napi/inner/napi_common/napi_common_util.cpp +++ b/frameworks/js/napi/inner/napi_common/napi_common_util.cpp @@ -844,7 +844,7 @@ AsyncJSCallbackInfo *CreateAsyncJSCallbackInfo(napi_env env) NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj)); Ability *ability = nullptr; - NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability)); + NAPI_CALL(env, napi_get_value_external(env, abilityObj, reinterpret_cast(&ability))); AsyncJSCallbackInfo *asyncCallbackInfo = new (std::nothrow) AsyncJSCallbackInfo; if (asyncCallbackInfo == nullptr) { diff --git a/frameworks/js/napi/particleAbility/particle_ability.cpp b/frameworks/js/napi/particleAbility/particle_ability.cpp index 28490f9932..e7bdf6f9a3 100644 --- a/frameworks/js/napi/particleAbility/particle_ability.cpp +++ b/frameworks/js/napi/particleAbility/particle_ability.cpp @@ -298,7 +298,7 @@ Ability* JsParticleAbility::GetAbility(napi_env env) return nullptr; } Ability* ability = nullptr; - ret = napi_get_value_external(env, abilityObj, (void **)&ability); + ret = napi_get_value_external(env, abilityObj, reinterpret_cast(&ability)); if (ret != napi_ok) { napi_get_last_error_info(env, &errorInfo); HILOG_ERROR("JsParticleAbility::GetAbility, get_value_external=%{public}d err:%{public}s", diff --git a/frameworks/js/napi/wantagent/napi_want_agent.cpp b/frameworks/js/napi/wantagent/napi_want_agent.cpp index 55112c5eb9..2b35d3c130 100644 --- a/frameworks/js/napi/wantagent/napi_want_agent.cpp +++ b/frameworks/js/napi/wantagent/napi_want_agent.cpp @@ -523,7 +523,6 @@ NativeValue* JsWantAgent::OnCancel(NativeEngine &engine, NativeCallbackInfo &inf task.Resolve(engine, engine.CreateUndefined()); }; - NativeValue* result = nullptr; AsyncTask::Schedule("JsWantAgent::OnCancel", engine, CreateAsyncTaskWithLastParam(engine, lastParam, nullptr, std::move(complete), &result)); @@ -757,7 +756,7 @@ NativeValue* JsWantAgent::OnGetWantAgent(NativeEngine &engine, NativeCallbackInf NativeValue *lastParam = (info.argc >= ARGC_TWO) ? info.argv[INDEX_ONE] : nullptr; std::shared_ptr spParas = std::make_shared(); - uint32_t ret = GetWantAgentParam(engine, info, *spParas); + int32_t ret = GetWantAgentParam(engine, info, *spParas); if (ret != 0) { HILOG_ERROR("Failed to get wantAgent param."); return RetErrMsg(engine, lastParam, ret); @@ -863,7 +862,7 @@ NativeValue* JsWantAgent::OnNapiGetWantAgent(NativeEngine &engine, NativeCallbac } std::shared_ptr spParas = std::make_shared(); - uint32_t ret = GetWantAgentParam(engine, info, *spParas); + int32_t ret = GetWantAgentParam(engine, info, *spParas); if (ret != 0) { HILOG_ERROR("Failed to get wantAgent param."); AbilityRuntimeErrorUtil::Throw(engine, ERR_ABILITY_RUNTIME_EXTERNAL_INVALID_PARAMETER); diff --git a/frameworks/native/ability/native/ability_context.cpp b/frameworks/native/ability/native/ability_context.cpp index a8643b35c4..de5e2603c9 100644 --- a/frameworks/native/ability/native/ability_context.cpp +++ b/frameworks/native/ability/native/ability_context.cpp @@ -156,7 +156,7 @@ bool AbilityContext::ConnectAbility(const Want &want, const sptrname.c_str()); - if (AppExecFwk::AbilityType::PAGE != type && AppExecFwk::AbilityType::SERVICE != type) { + if (type != AppExecFwk::AbilityType::PAGE && type != AppExecFwk::AbilityType::SERVICE) { HILOG_ERROR("AbilityContext::ConnectAbility AbilityType = %{public}d", type); return false; } @@ -178,7 +178,7 @@ ErrCode AbilityContext::DisconnectAbility(const sptr HILOG_INFO("Disconnect ability begin, caller:%{public}s.", info == nullptr ? "" : info->name.c_str()); AppExecFwk::AbilityType type = GetAbilityInfoType(); - if (AppExecFwk::AbilityType::PAGE != type && AppExecFwk::AbilityType::SERVICE != type) { + if (type != AppExecFwk::AbilityType::PAGE && type != AppExecFwk::AbilityType::SERVICE) { HILOG_ERROR("AbilityContext::DisconnectAbility AbilityType = %{public}d", type); return ERR_INVALID_VALUE; } @@ -194,7 +194,7 @@ bool AbilityContext::StopAbility(const AAFwk::Want &want) { HILOG_DEBUG("%{public}s begin.", __func__); AppExecFwk::AbilityType type = GetAbilityInfoType(); - if (AppExecFwk::AbilityType::PAGE != type && AppExecFwk::AbilityType::SERVICE != type) { + if (type != AppExecFwk::AbilityType::PAGE && type != AppExecFwk::AbilityType::SERVICE) { HILOG_ERROR("AbilityContext::StopAbility AbilityType = %{public}d", type); return false; } diff --git a/frameworks/native/ability/native/ability_lifecycle_executor.cpp b/frameworks/native/ability/native/ability_lifecycle_executor.cpp index fb3340f811..57969851a9 100644 --- a/frameworks/native/ability/native/ability_lifecycle_executor.cpp +++ b/frameworks/native/ability/native/ability_lifecycle_executor.cpp @@ -22,7 +22,7 @@ void AbilityLifecycleExecutor::DispatchLifecycleState(const AbilityLifecycleExec state_ = state; } -int AbilityLifecycleExecutor::GetState() +int AbilityLifecycleExecutor::GetState() const { return state_; } diff --git a/frameworks/native/appkit/ability_runtime/context/js_context_utils.cpp b/frameworks/native/appkit/ability_runtime/context/js_context_utils.cpp index 4bbd4767a7..fab7e24761 100644 --- a/frameworks/native/appkit/ability_runtime/context/js_context_utils.cpp +++ b/frameworks/native/appkit/ability_runtime/context/js_context_utils.cpp @@ -450,7 +450,7 @@ NativeValue* JsBaseContext::OnGetApplicationContext(NativeEngine& engine, Native } } // namespace -NativeValue* AttachBaseContext(NativeEngine* engine, void* value, void*) +NativeValue* AttachBaseContext(NativeEngine* engine, void* value, void* hint) { HILOG_INFO("AttachBaseContext"); if (value == nullptr || engine == nullptr) { @@ -484,7 +484,7 @@ NativeValue* AttachBaseContext(NativeEngine* engine, void* value, void*) return contextObj; } -NativeValue* AttachApplicationContext(NativeEngine* engine, void* value, void*) +NativeValue* AttachApplicationContext(NativeEngine* engine, void* value, void* hint) { HILOG_INFO("AttachApplicationContext"); if (value == nullptr || engine == nullptr) { diff --git a/interfaces/inner_api/app_manager/include/appmgr/app_scheduler_proxy.h b/interfaces/inner_api/app_manager/include/appmgr/app_scheduler_proxy.h index 4306d7dce8..7d3a056d30 100644 --- a/interfaces/inner_api/app_manager/include/appmgr/app_scheduler_proxy.h +++ b/interfaces/inner_api/app_manager/include/appmgr/app_scheduler_proxy.h @@ -58,7 +58,7 @@ public: * * @return */ - virtual void ScheduleShrinkMemory(const int32_t) override; + virtual void ScheduleShrinkMemory(const int32_t level) override; /** * ScheduleLowMemory, call ScheduleLowMemory() through proxy project, @@ -84,7 +84,7 @@ public: * * @return */ - virtual void ScheduleLaunchApplication(const AppLaunchData &, const Configuration &) override; + virtual void ScheduleLaunchApplication(const AppLaunchData &launchData, const Configuration &config) override; /** * Notify application to launch ability stage. @@ -112,7 +112,7 @@ public: * @param The ability token. * @return */ - virtual void ScheduleCleanAbility(const sptr &) override; + virtual void ScheduleCleanAbility(const sptr &token) override; /** * ScheduleProfileChanged, call ScheduleProfileChanged() through proxy project, @@ -121,7 +121,7 @@ public: * @param The profile data. * @return */ - virtual void ScheduleProfileChanged(const Profile &) override; + virtual void ScheduleProfileChanged(const Profile &profile) override; /** * ScheduleConfigurationUpdated, call ScheduleConfigurationUpdated() through proxy project, diff --git a/interfaces/inner_api/app_manager/src/appmgr/app_scheduler_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/app_scheduler_proxy.cpp index 941f653a3d..fc78a27ee7 100644 --- a/interfaces/inner_api/app_manager/src/appmgr/app_scheduler_proxy.cpp +++ b/interfaces/inner_api/app_manager/src/appmgr/app_scheduler_proxy.cpp @@ -132,7 +132,7 @@ void AppSchedulerProxy::ScheduleShrinkMemory(const int32_t level) ScheduleMemoryCommon(level, operation); } -void AppSchedulerProxy::ScheduleMemoryCommon(const int32_t level, uint32_t operation) +void AppSchedulerProxy::ScheduleMemoryCommon(const int32_t level, const uint32_t operation) { MessageParcel data; MessageParcel reply; diff --git a/interfaces/inner_api/wantagent/src/pending_want.cpp b/interfaces/inner_api/wantagent/src/pending_want.cpp index 9163daf20a..7f7f983e19 100644 --- a/interfaces/inner_api/wantagent/src/pending_want.cpp +++ b/interfaces/inner_api/wantagent/src/pending_want.cpp @@ -65,7 +65,7 @@ std::shared_ptr PendingWant::GetAbility( } WantSenderInfo wantSenderInfo; - wantSenderInfo.type = (int32_t)WantAgentConstant::OperationType::START_ABILITY; + wantSenderInfo.type = static_cast(WantAgentConstant::OperationType::START_ABILITY); wantSenderInfo.allWants.push_back(wantsInfo); wantSenderInfo.bundleName = context->GetBundleName(); wantSenderInfo.flags = flags; @@ -94,7 +94,7 @@ std::shared_ptr PendingWant::GetAbilities( } WantSenderInfo wantSenderInfo; - wantSenderInfo.type = (int32_t)WantAgentConstant::OperationType::START_ABILITIES; + wantSenderInfo.type = static_cast(WantAgentConstant::OperationType::START_ABILITIES); wantSenderInfo.bundleName = context->GetBundleName(); wantSenderInfo.flags = flags; wantSenderInfo.userId = -1; // -1 : invalid user id @@ -138,7 +138,7 @@ std::shared_ptr PendingWant::GetCommonEventAsUser( wantsInfo.resolvedTypes = want != nullptr ? want->GetType() : ""; WantSenderInfo wantSenderInfo; - wantSenderInfo.type = (int32_t)WantAgentConstant::OperationType::SEND_COMMON_EVENT; + wantSenderInfo.type = static_cast(WantAgentConstant::OperationType::SEND_COMMON_EVENT); wantSenderInfo.allWants.push_back(wantsInfo); wantSenderInfo.bundleName = context->GetBundleName(); wantSenderInfo.flags = flags; @@ -182,7 +182,7 @@ std::shared_ptr PendingWant::BuildServicePendingWant( wantsInfo.resolvedTypes = want != nullptr ? want->GetType() : ""; WantSenderInfo wantSenderInfo; - wantSenderInfo.type = (int32_t)serviceKind; + wantSenderInfo.type = static_cast(serviceKind); wantSenderInfo.allWants.push_back(wantsInfo); wantSenderInfo.bundleName = context->GetBundleName(); wantSenderInfo.flags = flags; diff --git a/interfaces/inner_api/wantagent/src/want_agent_helper.cpp b/interfaces/inner_api/wantagent/src/want_agent_helper.cpp index 0594f921ff..904ae67e00 100644 --- a/interfaces/inner_api/wantagent/src/want_agent_helper.cpp +++ b/interfaces/inner_api/wantagent/src/want_agent_helper.cpp @@ -35,26 +35,26 @@ unsigned int WantAgentHelper::FlagsTransformer(const std::vector(FLAG_UPDATE_CURRENT); return wantFlags; } for (auto flag : flags) { switch (flag) { case WantAgentConstant::Flags::ONE_TIME_FLAG: - wantFlags |= (unsigned int)FLAG_ONE_SHOT; + wantFlags |= static_cast(FLAG_ONE_SHOT); break; case WantAgentConstant::Flags::NO_BUILD_FLAG: - wantFlags |= (unsigned int)FLAG_NO_CREATE; + wantFlags |= static_cast(FLAG_NO_CREATE); break; case WantAgentConstant::Flags::CANCEL_PRESENT_FLAG: - wantFlags |= (unsigned int)FLAG_CANCEL_CURRENT; + wantFlags |= static_cast(FLAG_CANCEL_CURRENT); break; case WantAgentConstant::Flags::UPDATE_PRESENT_FLAG: - wantFlags |= (unsigned int)FLAG_UPDATE_CURRENT; + wantFlags |= static_cast(FLAG_UPDATE_CURRENT); break; case WantAgentConstant::Flags::CONSTANT_FLAG: - wantFlags |= (unsigned int)FLAG_IMMUTABLE; + wantFlags |= static_cast(FLAG_IMMUTABLE); break; default: WANT_AGENT_LOGE("WantAgentHelper::flags is error."); @@ -155,7 +155,7 @@ std::shared_ptr WantAgentHelper::GetWantAgent(const WantAgentInfo &pa wantSenderInfo.allWants.push_back(wantsInfo); wantSenderInfo.bundleName = want->GetOperation().GetBundleName(); wantSenderInfo.flags = FlagsTransformer(paramsInfo.GetFlags()); - wantSenderInfo.type = (int32_t)paramsInfo.GetOperationType(); + wantSenderInfo.type = static_cast(paramsInfo.GetOperationType()); wantSenderInfo.userId = userId; sptr target = WantAgentClient::GetInstance().GetWantSender(wantSenderInfo, nullptr); diff --git a/interfaces/kits/native/ability/native/ability_context.h b/interfaces/kits/native/ability/native/ability_context.h index b3c2a918a8..2fc3771d30 100644 --- a/interfaces/kits/native/ability/native/ability_context.h +++ b/interfaces/kits/native/ability/native/ability_context.h @@ -152,7 +152,7 @@ public: * @return errCode ERR_OK on success, others on failure. */ using ContextContainer::StartAbility; - ErrCode StartAbility(const AAFwk::Want &Want, int requestCode) override; + ErrCode StartAbility(const AAFwk::Want &want, int requestCode) override; /** * @brief Starts a new ability with special ability start setting. diff --git a/interfaces/kits/native/ability/native/ability_lifecycle_executor.h b/interfaces/kits/native/ability/native/ability_lifecycle_executor.h index 0914b72a77..2dca73d2db 100644 --- a/interfaces/kits/native/ability/native/ability_lifecycle_executor.h +++ b/interfaces/kits/native/ability/native/ability_lifecycle_executor.h @@ -48,7 +48,7 @@ public: * @return return Returns the int value of the ability lifecycle state represented * by the AbilityLifecycleExecutor.LifecycleState enum constant. */ - int GetState(); + int GetState() const; private: AbilityLifecycleExecutor::LifecycleState state_ = UNINITIALIZED; diff --git a/interfaces/kits/native/ability/native/ability_process.h b/interfaces/kits/native/ability/native/ability_process.h index a7b5593b26..5e5b09f16a 100644 --- a/interfaces/kits/native/ability/native/ability_process.h +++ b/interfaces/kits/native/ability/native/ability_process.h @@ -32,7 +32,7 @@ public: virtual ~AbilityProcess(); static std::shared_ptr GetInstance(); - ErrCode StartAbility(Ability *ability, CallAbilityParam param, CallbackInfo callbackInfo); + ErrCode StartAbility(Ability *ability, CallAbilityParam param, CallbackInfo callback); void OnAbilityResult(Ability *ability, int requestCode, int resultCode, const Want &resultData); void AddAbilityResultCallback(Ability *ability, CallAbilityParam ¶m, int32_t errCode, CallbackInfo &callback); diff --git a/services/abilitymgr/src/pending_want_record.cpp b/services/abilitymgr/src/pending_want_record.cpp index 2405ac583c..e880178332 100644 --- a/services/abilitymgr/src/pending_want_record.cpp +++ b/services/abilitymgr/src/pending_want_record.cpp @@ -99,7 +99,7 @@ int32_t PendingWantRecord::SenderInner(SenderInfo &senderInfo) break; } case static_cast(OperationType::START_SERVICE): - case (int32_t)OperationType::START_FOREGROUND_SERVICE: + case static_cast(OperationType::START_FOREGROUND_SERVICE): res = pendingWantManager->PendingWantStartAbility(want, callerToken_, -1, callerUid_); break; case static_cast(OperationType::SEND_COMMON_EVENT): diff --git a/test/fuzztest/appstateobservermanager_fuzzer/appstateobservermanager_fuzzer.cpp b/test/fuzztest/appstateobservermanager_fuzzer/appstateobservermanager_fuzzer.cpp index 7c3ba77cf5..270bf9a9a2 100755 --- a/test/fuzztest/appstateobservermanager_fuzzer/appstateobservermanager_fuzzer.cpp +++ b/test/fuzztest/appstateobservermanager_fuzzer/appstateobservermanager_fuzzer.cpp @@ -62,7 +62,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) appStateObserverManager->HandleOnRenderProcessCreated(renderRecord); appStateObserverManager->HandleOnRenderProcessDied(renderRecord); - ProcessData processData; appStateObserverManager->HandleOnProcessCreated(processData); appStateObserverManager->HandleOnProcessStateChanged(appRecord);