From 11ca2ea37f654977b615a8cc6efed50861ecb3b2 Mon Sep 17 00:00:00 2001 From: songjindian Date: Thu, 1 Aug 2024 11:18:36 +0800 Subject: [PATCH] =?UTF-8?q?context=E6=97=A5=E5=BF=97=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: songjindian --- frameworks/cj/ffi/cj_application_context.cpp | 10 +- frameworks/cj/ffi/cj_element_name_ffi.cpp | 4 +- .../js_sendable_context_manager.cpp | 76 ++-- .../ability_runtime/ability_context_impl.cpp | 188 +++++---- .../ability_runtime/js_extension_context.cpp | 14 +- .../native/ability/native/ability_context.cpp | 15 +- .../cj_ability_connect_callback_object.cpp | 14 +- .../ability_runtime/cj_ability_context.cpp | 65 ++- .../cj_ability_context_object.cpp | 74 ++-- .../native/ability_runtime/cj_ability_ffi.cpp | 8 +- .../ability_runtime/js_ability_context.cpp | 375 +++++++++--------- .../js_ui_extension_content_session.cpp | 2 +- .../js_ui_extension_context.cpp | 48 +-- .../js_uiservice_uiext_connection.cpp | 2 +- .../ui_extension_context.cpp | 2 +- 15 files changed, 446 insertions(+), 451 deletions(-) diff --git a/frameworks/cj/ffi/cj_application_context.cpp b/frameworks/cj/ffi/cj_application_context.cpp index 6dd2ab80e05..d2f243ee10c 100644 --- a/frameworks/cj/ffi/cj_application_context.cpp +++ b/frameworks/cj/ffi/cj_application_context.cpp @@ -29,7 +29,7 @@ int CJApplicationContext::GetArea() { auto context = applicationContext_.lock(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "application context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return INVALID_CODE; } return context->GetArea(); @@ -39,7 +39,7 @@ std::shared_ptr CJApplicationContext::GetApplicatio { auto context = applicationContext_.lock(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "application context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } return context->GetApplicationInfo(); @@ -50,7 +50,7 @@ int64_t FFIGetArea(int64_t id) { auto context = FFI::FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "cj application context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return INVALID_CODE; } return context->GetArea(); @@ -60,13 +60,13 @@ CApplicationInfo* FFICJApplicationInfo(int64_t id) { auto context = FFI::FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "cj application context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } auto appInfo = context->GetApplicationInfo(); CApplicationInfo* buffer = static_cast(malloc(sizeof(CApplicationInfo))); if (buffer == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "fail to malloc appinfo."); + TAG_LOGE(AAFwkTag::CONTEXT, "malloc appinfo fail"); return nullptr; } buffer->name = CreateCStringFromString(appInfo->name); diff --git a/frameworks/cj/ffi/cj_element_name_ffi.cpp b/frameworks/cj/ffi/cj_element_name_ffi.cpp index e86e8ff522d..8ec8a99e36c 100644 --- a/frameworks/cj/ffi/cj_element_name_ffi.cpp +++ b/frameworks/cj/ffi/cj_element_name_ffi.cpp @@ -31,7 +31,7 @@ ElementNameHandle FFICJElementNameCreateWithContent( void FFICJElementNameDelete(ElementNameHandle elementNameHandle) { if (elementNameHandle == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "input element name handle is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null elementNameHandle"); return; } auto actualElementName = reinterpret_cast(elementNameHandle); @@ -44,7 +44,7 @@ ElementNameParams* FFICJElementNameGetElementNameInfo(ElementNameHandle elementN { ElementNameParams* buffer = static_cast(malloc(sizeof(ElementNameParams))); if (buffer == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "fail to malloc element name params."); + TAG_LOGE(AAFwkTag::CONTEXT, "null buffer"); return nullptr; } diff --git a/frameworks/js/napi/app/sendable_context_manager/js_sendable_context_manager.cpp b/frameworks/js/napi/app/sendable_context_manager/js_sendable_context_manager.cpp index a67d2e2722a..1261ba17313 100644 --- a/frameworks/js/napi/app/sendable_context_manager/js_sendable_context_manager.cpp +++ b/frameworks/js/napi/app/sendable_context_manager/js_sendable_context_manager.cpp @@ -46,7 +46,7 @@ public: void JsContext::Finalizer(napi_env env, void* data, void* hint) { - TAG_LOGD(AAFwkTag::CONTEXT, "finalizer called"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (data == nullptr) { TAG_LOGE(AAFwkTag::CONTEXT, "null data"); return; @@ -62,13 +62,13 @@ napi_value CreateSendableContextObject(napi_env env, std::shared_ptr co // Sendable context has no property for now. status = napi_create_sendable_object_with_properties(env, 0, nullptr, &objValue); if (status != napi_ok) { - TAG_LOGE(AAFwkTag::CONTEXT, "Create sendable context failed with %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "create sendable context failed:%{public}d", status); return nullptr; } status = napi_wrap_sendable(env, objValue, jsContext.release(), JsContext::Finalizer, nullptr); if (status != napi_ok) { - TAG_LOGE(AAFwkTag::CONTEXT, "Wrap sendable failed with %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "wrap sendable failed:%{public}d", status); return nullptr; } @@ -92,7 +92,7 @@ napi_value CreateJsBaseContextFromSendable(napi_env env, void* wrapped) auto contextPtr = Context::ConvertTo(context); if (contextPtr == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Convert to context failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } @@ -100,7 +100,7 @@ napi_value CreateJsBaseContextFromSendable(napi_env env, void* wrapped) auto value = CreateJsBaseContext(env, contextPtr); auto systemModule = JsRuntime::LoadSystemModuleByEngine(env, "application.Context", &value, 1); if (systemModule == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Load context module failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null system module"); return nullptr; } @@ -118,13 +118,13 @@ napi_value CreateJsApplicationContextFromSendable(napi_env env, void* wrapped) auto weakContext = sendableContext->context_; std::shared_ptr context = weakContext.lock(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Context invalid."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } auto applicationContext = Context::ConvertTo(context); if (applicationContext == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Convert to application context failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null application context"); return nullptr; } @@ -132,7 +132,7 @@ napi_value CreateJsApplicationContextFromSendable(napi_env env, void* wrapped) auto value = JsApplicationContextUtils::CreateJsApplicationContext(env); auto systemModule = JsRuntime::LoadSystemModuleByEngine(env, "application.ApplicationContext", &value, 1); if (systemModule == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Load application context module failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null system module"); return nullptr; } @@ -150,13 +150,13 @@ napi_value CreateJsAbilityStageContextFromSendable(napi_env env, void* wrapped) auto weakContext = sendableContext->context_; std::shared_ptr context = weakContext.lock(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Context invalid."); + TAG_LOGE(AAFwkTag::CONTEXT, "context invalid"); return nullptr; } auto abilitystageContext = Context::ConvertTo(context); if (abilitystageContext == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Convert to ability stage context failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null abilitystageContext"); return nullptr; } @@ -164,7 +164,7 @@ napi_value CreateJsAbilityStageContextFromSendable(napi_env env, void* wrapped) auto value = CreateJsAbilityStageContext(env, abilitystageContext); auto systemModule = JsRuntime::LoadSystemModuleByEngine(env, "application.AbilityStageContext", &value, 1); if (systemModule == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Load ability stage context module failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null systemModule"); return nullptr; } @@ -182,7 +182,7 @@ napi_value CreateJsUIAbilityContextFromSendable(napi_env env, void* wrapped) auto weakContext = sendableContext->context_; std::shared_ptr context = weakContext.lock(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "null ontext"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } @@ -196,7 +196,7 @@ napi_value CreateJsUIAbilityContextFromSendable(napi_env env, void* wrapped) auto value = CreateJsAbilityContext(env, uiAbilityContext); auto systemModule = JsRuntime::LoadSystemModuleByEngine(env, "application.AbilityContext", &value, 1); if (systemModule == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Load ability context module failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null systemModule"); return nullptr; } @@ -210,9 +210,9 @@ public: static void Finalizer(napi_env env, void *data, void *hint) { - TAG_LOGD(AAFwkTag::CONTEXT, "finalizer called"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (data == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "null data"); + TAG_LOGE(AAFwkTag::CONTEXT, "input data invalid"); return; } std::unique_ptr(static_cast(data)); @@ -257,21 +257,21 @@ private: bool stageMode = false; napi_status status = IsStageContext(env, info.argv[0], stageMode); if (status != napi_ok || !stageMode) { - TAG_LOGE(AAFwkTag::CONTEXT, "Context isn't stageMode, status is %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "context isn't stageMode, status is %{public}d", status); ThrowInvalidParamError(env, "Parse param context failed, must be a context of stageMode."); return CreateJsUndefined(env); } auto context = GetStageModeContext(env, info.argv[0]); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Get context failed"); + TAG_LOGE(AAFwkTag::CONTEXT, "get context failed"); ThrowInvalidParamError(env, "Parse param context failed, must not be nullptr."); return CreateJsUndefined(env); } auto contextPtr = Context::ConvertTo(context); if (contextPtr == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Convert to context failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "convert to context failed"); ThrowInvalidParamError(env, "Parse param context failed, must be a context."); return CreateJsUndefined(env); } @@ -282,9 +282,9 @@ private: napi_value OnConvertToContext(napi_env env, NapiCallbackInfo &info) { - TAG_LOGD(AAFwkTag::CONTEXT, "Convert to context."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (info.argc != ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "The number of parameter is invalid."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params"); ThrowInvalidParamError(env, "Parameter error: The number of parameter is invalid."); return CreateJsUndefined(env); } @@ -293,7 +293,7 @@ private: void *wrapped = nullptr; auto status = napi_unwrap_sendable(env, info.argv[0], &wrapped); if (status != napi_ok) { - TAG_LOGE(AAFwkTag::CONTEXT, "Unwrap sendable object failed with %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "unwrap sendable failed:%{public}d", status); ThrowInvalidParamError(env, "Parameter error: Input parameter is invalid."); return CreateJsUndefined(env); } @@ -301,7 +301,7 @@ private: // Create normal context auto object = CreateJsBaseContextFromSendable(env, wrapped); if (object == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Create base context failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "create base context failed"); ThrowInvalidParamError(env, "Parameter error: Create context failed."); return CreateJsUndefined(env); } @@ -311,9 +311,9 @@ private: napi_value OnConvertToApplicationContext(napi_env env, NapiCallbackInfo &info) { - TAG_LOGD(AAFwkTag::CONTEXT, "Convert to application context."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (info.argc != ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "The number of parameter is invalid."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params"); ThrowInvalidParamError(env, "Parameter error: The number of parameter is invalid."); return CreateJsUndefined(env); } @@ -322,7 +322,7 @@ private: void *wrapped = nullptr; auto status = napi_unwrap_sendable(env, info.argv[0], &wrapped); if (status != napi_ok) { - TAG_LOGE(AAFwkTag::CONTEXT, "Unwrap sendable object failed with %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "unwrap sendable failed: %{public}d", status); ThrowInvalidParamError(env, "Parameter error: Input parameter is invalid."); return CreateJsUndefined(env); } @@ -330,7 +330,7 @@ private: // Create normal context auto object = CreateJsApplicationContextFromSendable(env, wrapped); if (object == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Create base context failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "create base context failed"); ThrowInvalidParamError(env, "Parameter error: Create application context failed."); return CreateJsUndefined(env); } @@ -340,9 +340,9 @@ private: napi_value OnConvertToAbilityStageContext(napi_env env, NapiCallbackInfo &info) { - TAG_LOGD(AAFwkTag::CONTEXT, "Convert to ability stage context."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (info.argc != ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "The number of parameter is invalid."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params"); ThrowInvalidParamError(env, "Parameter error: The number of parameter is invalid."); return CreateJsUndefined(env); } @@ -351,7 +351,7 @@ private: void *wrapped = nullptr; auto status = napi_unwrap_sendable(env, info.argv[0], &wrapped); if (status != napi_ok) { - TAG_LOGE(AAFwkTag::CONTEXT, "Unwrap sendable object failed with %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "unwrap sendable object failed with %{public}d", status); ThrowInvalidParamError(env, "Parameter error: Input parameter is invalid."); return CreateJsUndefined(env); } @@ -359,7 +359,7 @@ private: // Create normal context auto object = CreateJsAbilityStageContextFromSendable(env, wrapped); if (object == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Create base context failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context object"); ThrowInvalidParamError(env, "Parameter error: Create ability stage context failed."); return CreateJsUndefined(env); } @@ -369,9 +369,9 @@ private: napi_value OnConvertToUIAbilityContext(napi_env env, NapiCallbackInfo &info) { - TAG_LOGD(AAFwkTag::CONTEXT, "Convert to uiability context."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (info.argc != ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "The number of parameter is invalid."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params"); ThrowInvalidParamError(env, "Parameter error: The number of parameter is invalid."); return CreateJsUndefined(env); } @@ -380,7 +380,7 @@ private: void *wrapped = nullptr; auto status = napi_unwrap_sendable(env, info.argv[0], &wrapped); if (status != napi_ok) { - TAG_LOGE(AAFwkTag::CONTEXT, "Unwrap sendable object failed with %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params %{public}d", status); ThrowInvalidParamError(env, "Parameter error: Input parameter is invalid."); return CreateJsUndefined(env); } @@ -388,7 +388,7 @@ private: // Create uiability context auto object = CreateJsUIAbilityContextFromSendable(env, wrapped); if (object == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Create uiability context failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null uiability context"); ThrowInvalidParamError(env, "Parameter error: Create uiability context failed."); return CreateJsUndefined(env); } @@ -399,9 +399,9 @@ private: napi_value CreateJsSendableContextManager(napi_env env, napi_value exportObj) { - TAG_LOGD(AAFwkTag::CONTEXT, "Create sendable context manager."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (env == nullptr || exportObj == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Invalid parameter."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params"); return nullptr; } @@ -409,7 +409,7 @@ napi_value CreateJsSendableContextManager(napi_env env, napi_value exportObj) std::unique_ptr sendableMgr = std::make_unique(); status = napi_wrap(env, exportObj, sendableMgr.release(), JsSendableContextManager::Finalizer, nullptr, nullptr); if (status != napi_ok) { - TAG_LOGE(AAFwkTag::CONTEXT, "napi wrap failed with %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "wrap failed:%{public}d", status); return nullptr; } @@ -423,7 +423,7 @@ napi_value CreateJsSendableContextManager(napi_env env, napi_value exportObj) status = napi_define_properties(env, exportObj, sizeof(properties) / sizeof(properties[0]), properties); if (status != napi_ok) { - TAG_LOGE(AAFwkTag::CONTEXT, "napi define property failed with %{public}d.", status); + TAG_LOGE(AAFwkTag::CONTEXT, "failed:%{public}d", status); return nullptr; } diff --git a/frameworks/native/ability/ability_runtime/ability_context_impl.cpp b/frameworks/native/ability/ability_runtime/ability_context_impl.cpp index 88f85b6f528..9a9b71ebc36 100644 --- a/frameworks/native/ability/ability_runtime/ability_context_impl.cpp +++ b/frameworks/native/ability/ability_runtime/ability_context_impl.cpp @@ -132,7 +132,7 @@ bool AbilityContextImpl::PrintDrawnCompleted() void AbilityContextImpl::SwitchArea(int mode) { - TAG_LOGD(AAFwkTag::CONTEXT, "mode:%{public}d.", mode); + TAG_LOGD(AAFwkTag::CONTEXT, "mode:%{public}d", mode); if (stageContext_ != nullptr) { stageContext_->SwitchArea(mode); } @@ -140,9 +140,9 @@ void AbilityContextImpl::SwitchArea(int mode) int AbilityContextImpl::GetArea() { - TAG_LOGD(AAFwkTag::CONTEXT, "GetArea"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (stageContext_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "stageContext is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null stageContext"); return ContextImpl::EL_DEFAULT; } return stageContext_->GetArea(); @@ -151,10 +151,10 @@ int AbilityContextImpl::GetArea() ErrCode AbilityContextImpl::StartAbility(const AAFwk::Want& want, int requestCode) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbility"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, token_, requestCode); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbility. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); } return err; } @@ -162,21 +162,21 @@ ErrCode AbilityContextImpl::StartAbility(const AAFwk::Want& want, int requestCod ErrCode AbilityContextImpl::StartAbilityAsCaller(const AAFwk::Want &want, int requestCode) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbilityAsCaller"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbilityAsCaller(want, token_, nullptr, requestCode); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityAsCaller. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); } return err; } ErrCode AbilityContextImpl::StartAbilityWithAccount(const AAFwk::Want& want, int accountId, int requestCode) { - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbilityWithAccount"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); (const_cast(want)).SetParam(START_ABILITY_TYPE, true); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, token_, requestCode, accountId); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityWithAccount. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); } return err; } @@ -185,10 +185,10 @@ ErrCode AbilityContextImpl::StartAbility(const AAFwk::Want& want, const AAFwk::S int requestCode) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbility"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, startOptions, token_, requestCode); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbility. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); } return err; } @@ -197,11 +197,11 @@ ErrCode AbilityContextImpl::StartAbilityAsCaller(const AAFwk::Want &want, const int requestCode) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbilityAsCaller"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbilityAsCaller(want, startOptions, token_, nullptr, requestCode); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityAsCaller. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); } return err; } @@ -215,18 +215,18 @@ ErrCode AbilityContextImpl::StartAbilityWithAccount( ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility( want, startOptions, token_, requestCode, accountId); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityWithAccount. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); } return err; } ErrCode AbilityContextImpl::StartAbilityForResult(const AAFwk::Want& want, int requestCode, RuntimeTask&& task) { - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbilityForResult"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); resultCallbacks_.insert(make_pair(requestCode, std::move(task))); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, token_, requestCode, -1); if (err != ERR_OK && err != AAFwk::START_ABILITY_WAITING) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResult. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); OnAbilityResultInner(requestCode, err, want); } return err; @@ -239,7 +239,7 @@ ErrCode AbilityContextImpl::StartAbilityForResultWithAccount( resultCallbacks_.insert(make_pair(requestCode, std::move(task))); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, token_, requestCode, accountId); if (err != ERR_OK && err != AAFwk::START_ABILITY_WAITING) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResultWithAccount. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); OnAbilityResultInner(requestCode, err, want); } return err; @@ -248,11 +248,11 @@ ErrCode AbilityContextImpl::StartAbilityForResultWithAccount( ErrCode AbilityContextImpl::StartAbilityForResult(const AAFwk::Want& want, const AAFwk::StartOptions& startOptions, int requestCode, RuntimeTask&& task) { - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbilityForResult"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); resultCallbacks_.insert(make_pair(requestCode, std::move(task))); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility(want, startOptions, token_, requestCode); if (err != ERR_OK && err != AAFwk::START_ABILITY_WAITING) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResult. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); OnAbilityResultInner(requestCode, err, want); } return err; @@ -262,12 +262,12 @@ ErrCode AbilityContextImpl::StartAbilityForResultWithAccount( const AAFwk::Want& want, int accountId, const AAFwk::StartOptions& startOptions, int requestCode, RuntimeTask&& task) { - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbilityForResultWithAccount"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); resultCallbacks_.insert(make_pair(requestCode, std::move(task))); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartAbility( want, startOptions, token_, requestCode, accountId); if (err != ERR_OK && err != AAFwk::START_ABILITY_WAITING) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResultWithAccount. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "ret=%{public}d", err); OnAbilityResultInner(requestCode, err, want); } return err; @@ -275,43 +275,43 @@ ErrCode AbilityContextImpl::StartAbilityForResultWithAccount( ErrCode AbilityContextImpl::StartUIServiceExtensionAbility(const AAFwk::Want& want, int32_t accountId) { - TAG_LOGI(AAFwkTag::CONTEXT, "name:%{public}s %{public}s, accountId=%{public}d", + TAG_LOGD(AAFwkTag::CONTEXT, "name:%{public}s %{public}s, accountId=%{public}d", want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), accountId); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartExtensionAbility( want, token_, accountId, AppExecFwk::ExtensionAbilityType::UI_SERVICE); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartUIServiceExtension is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed, ret: %{public}d", err); } return err; } ErrCode AbilityContextImpl::StartServiceExtensionAbility(const AAFwk::Want& want, int32_t accountId) { - TAG_LOGI(AAFwkTag::CONTEXT, "name:%{public}s %{public}s, accountId=%{public}d", + TAG_LOGD(AAFwkTag::CONTEXT, "name:%{public}s %{public}s, accountId=%{public}d", want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), accountId); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StartExtensionAbility( want, token_, accountId, AppExecFwk::ExtensionAbilityType::SERVICE); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartServiceExtensionAbility is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed:%{public}d", err); } return err; } ErrCode AbilityContextImpl::StopServiceExtensionAbility(const AAFwk::Want& want, int32_t accountId) { - TAG_LOGI(AAFwkTag::CONTEXT, "name:%{public}s %{public}s, accountId=%{public}d", + TAG_LOGD(AAFwkTag::CONTEXT, "name:%{public}s %{public}s, accountId=%{public}d", want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), accountId); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->StopExtensionAbility( want, token_, accountId, AppExecFwk::ExtensionAbilityType::SERVICE); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "StopServiceExtensionAbility is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed %{public}d", err); } return err; } ErrCode AbilityContextImpl::TerminateAbilityWithResult(const AAFwk::Want& want, int resultCode) { - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateAbilityWithResult"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); isTerminating_.store(true); #ifdef SUPPORT_SCREEN if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) { @@ -324,16 +324,16 @@ ErrCode AbilityContextImpl::TerminateAbilityWithResult(const AAFwk::Want& want, info->resultCode = resultCode; auto ifaceSessionToken = iface_cast(sessionToken); auto err = ifaceSessionToken->TerminateSession(info); - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateAbilityWithResult. ret=%{public}d", err); + TAG_LOGI(AAFwkTag::CONTEXT, "scb, ret=%{public}d", err); return static_cast(err); } else { ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->TerminateAbility(token_, resultCode, &want); - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateAbilityWithResult. ret=%{public}d", err); + TAG_LOGI(AAFwkTag::CONTEXT, "ret=%{public}d", err); return err; } #else ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->TerminateAbility(token_, resultCode, &want); - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateAbilityWithResult. ret=%{public}d", err); + TAG_LOGI(AAFwkTag::CONTEXT, "ret=%{public}d", err); return err; #endif } @@ -341,20 +341,20 @@ ErrCode AbilityContextImpl::TerminateAbilityWithResult(const AAFwk::Want& want, void AbilityContextImpl::SetWeakSessionToken(const wptr& sessionToken) { std::lock_guard lock(sessionTokenMutex_); - TAG_LOGI(AAFwkTag::CONTEXT, "Start calling SetWeakSessionToken."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); sessionToken_ = sessionToken; } sptr AbilityContextImpl::GetSessionToken() { std::lock_guard lock(sessionTokenMutex_); - TAG_LOGI(AAFwkTag::CONTEXT, "calling"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); return sessionToken_.promote(); } void AbilityContextImpl::SetAbilityRecordId(int32_t abilityRecordId) { - TAG_LOGI(AAFwkTag::CONTEXT, "abilityRecordId: %{public}d.", abilityRecordId); + TAG_LOGD(AAFwkTag::CONTEXT, "abilityRecordId: %{public}d", abilityRecordId); abilityRecordId_ = abilityRecordId; } @@ -365,7 +365,7 @@ int32_t AbilityContextImpl::GetAbilityRecordId() void AbilityContextImpl::OnAbilityResult(int requestCode, int resultCode, const AAFwk::Want& resultData) { - TAG_LOGD(AAFwkTag::CONTEXT, "Start calling OnAbilityResult."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); auto callback = resultCallbacks_.find(requestCode); if (callback != resultCallbacks_.end()) { if (callback->second) { @@ -373,12 +373,11 @@ void AbilityContextImpl::OnAbilityResult(int requestCode, int resultCode, const } resultCallbacks_.erase(requestCode); } - TAG_LOGI(AAFwkTag::CONTEXT, "OnAbilityResult"); } void AbilityContextImpl::OnAbilityResultInner(int requestCode, int resultCode, const AAFwk::Want& resultData) { - TAG_LOGD(AAFwkTag::CONTEXT, "Start calling OnAbilityResult."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); auto callback = resultCallbacks_.find(requestCode); if (callback != resultCallbacks_.end()) { if (callback->second) { @@ -386,17 +385,16 @@ void AbilityContextImpl::OnAbilityResultInner(int requestCode, int resultCode, c } resultCallbacks_.erase(requestCode); } - TAG_LOGI(AAFwkTag::CONTEXT, "OnAbilityResult"); } ErrCode AbilityContextImpl::ConnectAbility(const AAFwk::Want& want, const sptr& connectCallback) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); TAG_LOGD(AAFwkTag::CONTEXT, - "ConnectAbility begin, name:%{public}s.", abilityInfo_ == nullptr ? "" : abilityInfo_->name.c_str()); + "called, name:%{public}s", abilityInfo_ == nullptr ? "" : abilityInfo_->name.c_str()); ErrCode ret = ConnectionManager::GetInstance().ConnectAbility(token_, want, connectCallback); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "ConnectAbility ret:%{public}d", ret); + TAG_LOGE(AAFwkTag::CONTEXT, "failed, ret:%{public}d", ret); } return ret; } @@ -404,11 +402,11 @@ ErrCode AbilityContextImpl::ConnectAbility(const AAFwk::Want& want, const sptr& connectCallback) { - TAG_LOGD(AAFwkTag::CONTEXT, "ConnectAbilityWithAccount"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); ErrCode ret = ConnectionManager::GetInstance().ConnectAbilityWithAccount(token_, want, accountId, connectCallback); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "ConnectAbilityWithAccount ret:%{public}d", ret); + TAG_LOGE(AAFwkTag::CONTEXT, "failed, ret:%{public}d", ret); } return ret; } @@ -417,7 +415,7 @@ void AbilityContextImpl::DisconnectAbility(const AAFwk::Want& want, const sptr& connectCallback, int32_t accountId) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::CONTEXT, "DisconnectAbility begin, caller:%{public}s.", + TAG_LOGD(AAFwkTag::CONTEXT, "called, caller:%{public}s", abilityInfo_ == nullptr ? "" : abilityInfo_->name.c_str()); ErrCode ret = ConnectionManager::GetInstance().DisconnectAbility(token_, want, connectCallback, accountId); @@ -507,10 +505,10 @@ std::shared_ptr AbilityContextImpl::GetConfiguration( void AbilityContextImpl::MinimizeAbility(bool fromUser) { - TAG_LOGD(AAFwkTag::CONTEXT, "call"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->MinimizeAbility(token_, fromUser); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "MinimizeAbility is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed %{public}d", err); } } @@ -519,7 +517,7 @@ ErrCode AbilityContextImpl::OnBackPressedCallBack(bool &needMoveToBackground) TAG_LOGD(AAFwkTag::CONTEXT, "call"); auto abilityCallback = abilityCallback_.lock(); if (abilityCallback == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "abilityCallback is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null abilityCallback"); return ERR_INVALID_VALUE; } #ifdef SUPPORT_SCREEN @@ -530,10 +528,10 @@ ErrCode AbilityContextImpl::OnBackPressedCallBack(bool &needMoveToBackground) ErrCode AbilityContextImpl::MoveAbilityToBackground() { - TAG_LOGD(AAFwkTag::CONTEXT, "call"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->MoveAbilityToBackground(token_); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "MoveAbilityToBackground failed: %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed: %{public}d", err); } return err; } @@ -543,22 +541,22 @@ ErrCode AbilityContextImpl::MoveUIAbilityToBackground() TAG_LOGD(AAFwkTag::CONTEXT, "call"); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->MoveUIAbilityToBackground(token_); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "MoveAbilityToBackground failed: %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed: %{public}d", err); } return err; } ErrCode AbilityContextImpl::TerminateSelf() { - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateSelf"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); isTerminating_.store(true); auto sessionToken = GetSessionToken(); if (sessionToken == nullptr) { - TAG_LOGW(AAFwkTag::CONTEXT, "sessionToken is null"); + TAG_LOGW(AAFwkTag::CONTEXT, "null sessionToken"); } #ifdef SUPPORT_SCREEN if (Rosen::SceneBoardJudgement::IsSceneBoardEnabled() && sessionToken) { - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateSelf. SCB"); + TAG_LOGI(AAFwkTag::CONTEXT, "terminateSelf SCB"); AAFwk::Want resultWant; sptr info = new AAFwk::SessionInfo(); info->want = resultWant; @@ -570,7 +568,7 @@ ErrCode AbilityContextImpl::TerminateSelf() AAFwk::Want resultWant; ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->TerminateAbility(token_, -1, &resultWant); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "AbilityContextImpl::TerminateSelf is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "terminateSelf failed %{public}d", err); } return err; } @@ -578,7 +576,7 @@ ErrCode AbilityContextImpl::TerminateSelf() AAFwk::Want resultWant; ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->TerminateAbility(token_, -1, &resultWant); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "AbilityContextImpl::TerminateSelf is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed %{public}d", err); } return err; #endif @@ -587,12 +585,12 @@ ErrCode AbilityContextImpl::TerminateSelf() ErrCode AbilityContextImpl::CloseAbility() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::CONTEXT, "CloseAbility"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); isTerminating_.store(true); AAFwk::Want resultWant; ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->CloseAbility(token_, -1, &resultWant); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "CloseAbility failed: %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed: %{public}d", err); } return err; } @@ -604,7 +602,7 @@ sptr AbilityContextImpl::GetToken() ErrCode AbilityContextImpl::RestoreWindowStage(napi_env env, napi_value contentStorage) { - TAG_LOGI(AAFwkTag::CONTEXT, "call"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); napi_ref value = nullptr; napi_create_reference(env, contentStorage, 1, &value); contentStorage_ = std::unique_ptr(reinterpret_cast(value)); @@ -617,7 +615,7 @@ ErrCode AbilityContextImpl::StartAbilityByCall( if (localCallContainer_ == nullptr) { localCallContainer_ = std::make_shared(); if (localCallContainer_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "localCallContainer_ is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null localCallContainer_"); return ERR_INVALID_VALUE; } } @@ -626,29 +624,27 @@ ErrCode AbilityContextImpl::StartAbilityByCall( ErrCode AbilityContextImpl::ReleaseCall(const std::shared_ptr& callback) { - TAG_LOGD(AAFwkTag::CONTEXT, "Release begin."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (localCallContainer_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "localCallContainer_ is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null localCallContainer_"); return ERR_INVALID_VALUE; } - TAG_LOGD(AAFwkTag::CONTEXT, "Release end."); return localCallContainer_->ReleaseCall(callback); } void AbilityContextImpl::ClearFailedCallConnection(const std::shared_ptr& callback) { - TAG_LOGD(AAFwkTag::CONTEXT, "Clear begin."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (localCallContainer_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "localCallContainer_ is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null localCallContainer_"); return; } localCallContainer_->ClearFailedCallConnection(callback); - TAG_LOGD(AAFwkTag::CONTEXT, "Clear end."); } void AbilityContextImpl::RegisterAbilityCallback(std::weak_ptr abilityCallback) { - TAG_LOGD(AAFwkTag::CONTEXT, "call"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); abilityCallback_ = abilityCallback; } @@ -676,7 +672,7 @@ ErrCode AbilityContextImpl::RequestDialogService(napi_env env, AAFwk::Want &want uv_loop_s* loop = nullptr; napi_get_uv_event_loop(env, &loop); if (loop == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "RequestDialogService, fail to get uv loop."); + TAG_LOGE(AAFwkTag::CONTEXT, "null uv loop"); return; } auto work = new uv_work_t; @@ -701,7 +697,7 @@ ErrCode AbilityContextImpl::RequestDialogService(napi_env env, AAFwk::Want &want want.SetParam(RequestConstants::REQUEST_CALLBACK_KEY, remoteObject); auto err = AAFwk::AbilityManagerClient::GetInstance()->RequestDialogService(want, token_); - TAG_LOGD(AAFwkTag::CONTEXT, "RequestDialogService ret=%{public}d", static_cast(err)); + TAG_LOGD(AAFwkTag::CONTEXT, "ret=%{public}d", static_cast(err)); return err; } @@ -722,7 +718,7 @@ ErrCode AbilityContextImpl::RequestDialogService(AAFwk::Want &want, RequestDialo want.SetParam(RequestConstants::REQUEST_CALLBACK_KEY, remoteObject); auto err = AAFwk::AbilityManagerClient::GetInstance()->RequestDialogService(want, token_); - TAG_LOGD(AAFwkTag::CONTEXT, "RequestDialogService ret=%{public}d", static_cast(err)); + TAG_LOGD(AAFwkTag::CONTEXT, "ret=%{public}d", static_cast(err)); return err; } @@ -734,14 +730,14 @@ ErrCode AbilityContextImpl::ReportDrawnCompleted() void AbilityContextImpl::RequestDialogResultJSThreadWorker(uv_work_t* work, int status) { - TAG_LOGD(AAFwkTag::CONTEXT, "RequestDialogResultJSThreadWorker"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (work == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "RequestDialogResultJSThreadWorker, uv_queue_work input work is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null work"); return; } RequestResult* retCB = static_cast(work->data); if (retCB == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "RequestDialogResultJSThreadWorker, retCB is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null retCB"); delete work; work = nullptr; return; @@ -759,7 +755,7 @@ void AbilityContextImpl::RequestDialogResultJSThreadWorker(uv_work_t* work, int ErrCode AbilityContextImpl::GetMissionId(int32_t &missionId) { - TAG_LOGD(AAFwkTag::CONTEXT, "GetMissionId"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (missionId_ != -1) { missionId = missionId_; return ERR_OK; @@ -767,38 +763,38 @@ ErrCode AbilityContextImpl::GetMissionId(int32_t &missionId) ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->GetMissionIdByToken(token_, missionId); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "GetMissionId is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed %{public}d", err); } else { missionId_ = missionId; - TAG_LOGD(AAFwkTag::CONTEXT, "missionId is %{public}d.", missionId_); + TAG_LOGD(AAFwkTag::CONTEXT, "missionId: %{public}d", missionId_); } return err; } ErrCode AbilityContextImpl::SetMissionContinueState(const AAFwk::ContinueState &state) { - TAG_LOGI(AAFwkTag::CONTEXT, "SetMissionContinueState: %{public}d", state); + TAG_LOGI(AAFwkTag::CONTEXT, "called, stage: %{public}d", state); auto sessionToken = GetSessionToken(); if (sessionToken == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "sessionToken is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null sessionToken"); return ERR_INVALID_VALUE; } ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->SetMissionContinueState(token_, state, sessionToken); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "SetMissionContinueState failed: %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed: %{public}d", err); } return err; } void AbilityContextImpl::InsertResultCallbackTask(int requestCode, RuntimeTask &&task) { - TAG_LOGD(AAFwkTag::CONTEXT, "InsertResultCallbackTask"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); resultCallbacks_.insert(make_pair(requestCode, std::move(task))); } void AbilityContextImpl::RemoveResultCallbackTask(int requestCode) { - TAG_LOGD(AAFwkTag::CONTEXT, "called"); + TAG_LOGD(AAFwkTag::CONTEXT, "call"); resultCallbacks_.erase(requestCode); } @@ -815,10 +811,10 @@ void AbilityContextImpl::GetWindowRect(int32_t &left, int32_t &top, int32_t &wid void AbilityContextImpl::RegisterAbilityLifecycleObserver( const std::shared_ptr &observer) { - TAG_LOGD(AAFwkTag::CONTEXT, "call"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); auto abilityCallback = abilityCallback_.lock(); if (abilityCallback == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "register ability lifecycle observer failed, abilityCallback is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null abilityCallback, register failed"); return; } abilityCallback->RegisterAbilityLifecycleObserver(observer); @@ -830,7 +826,7 @@ void AbilityContextImpl::UnregisterAbilityLifecycleObserver( TAG_LOGD(AAFwkTag::CONTEXT, "call"); auto abilityCallback = abilityCallback_.lock(); if (abilityCallback == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "unregister ability lifecycle observer failed, abilityCallback is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null abilityCallback, unregister failed"); return; } abilityCallback->UnregisterAbilityLifecycleObserver(observer); @@ -839,10 +835,10 @@ void AbilityContextImpl::UnregisterAbilityLifecycleObserver( #ifdef SUPPORT_SCREEN ErrCode AbilityContextImpl::SetMissionLabel(const std::string& label) { - TAG_LOGD(AAFwkTag::CONTEXT, "call label:%{public}s", label.c_str()); + TAG_LOGD(AAFwkTag::CONTEXT, "label:%{public}s", label.c_str()); ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->SetMissionLabel(token_, label); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "SetMissionLabel is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed %{public}d", err); } else { auto abilityCallback = abilityCallback_.lock(); if (abilityCallback) { @@ -857,7 +853,7 @@ ErrCode AbilityContextImpl::SetMissionIcon(const std::shared_ptrSetMissionIcon(token_, icon); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "SetMissionIcon is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed %{public}d", err); } else { auto abilityCallback = abilityCallback_.lock(); if (abilityCallback) { @@ -893,7 +889,7 @@ ErrCode AbilityContextImpl::StartAbilityByType(const std::string &type, TAG_LOGD(AAFwkTag::CONTEXT, "call"); auto uiContent = GetUIContent(); if (uiContent == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "uiContent is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null uiContent"); return ERR_INVALID_VALUE; } wantParams.SetParam(UIEXTENSION_TARGET_TYPE_KEY, AAFwk::String::Box(type)); @@ -918,7 +914,7 @@ ErrCode AbilityContextImpl::StartAbilityByType(const std::string &type, Ace::ModalUIExtensionConfig config; int32_t sessionId = uiContent->CreateModalUIExtension(want, callback, config); if (sessionId == 0) { - TAG_LOGE(AAFwkTag::CONTEXT, "CreateModalUIExtension is failed"); + TAG_LOGE(AAFwkTag::CONTEXT, "createModalUIExtension failed"); return ERR_INVALID_VALUE; } uiExtensionCallbacks->SetUIContent(uiContent); @@ -955,16 +951,16 @@ ErrCode AbilityContextImpl::CreateModalUIExtensionWithApp(const AAFwk::Want &wan TAG_LOGD(AAFwkTag::CONTEXT, "call"); auto uiContent = GetUIContent(); if (uiContent == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "uiContent is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null uiContent"); return ERR_INVALID_VALUE; } if (IsUIExtensionExist(want)) { - TAG_LOGD(AAFwkTag::CONTEXT, "UIExtension is exist, not create again"); + TAG_LOGD(AAFwkTag::CONTEXT, "exist uIExtension"); return ERR_OK; } auto abilityCallback = abilityCallback_.lock(); if (abilityCallback == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "abilityCallback is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null abilityCallback"); return ERR_INVALID_VALUE; } auto disposedCallback = std::make_shared(abilityCallback); @@ -981,7 +977,7 @@ ErrCode AbilityContextImpl::CreateModalUIExtensionWithApp(const AAFwk::Want &wan Ace::ModalUIExtensionConfig config; int32_t sessionId = uiContent->CreateModalUIExtension(want, callback, config); if (sessionId == 0) { - TAG_LOGE(AAFwkTag::CONTEXT, "CreateModalUIExtension is failed"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed"); return ERR_INVALID_VALUE; } disposedCallback->SetUIContent(uiContent); @@ -998,7 +994,7 @@ ErrCode AbilityContextImpl::RequestModalUIExtension(const AAFwk::Want& want) { ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->RequestModalUIExtension(want); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "RequestModalUIExtension is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed %{public}d", err); } return err; } @@ -1007,7 +1003,7 @@ ErrCode AbilityContextImpl::ChangeAbilityVisibility(bool isShow) { ErrCode err = AAFwk::AbilityManagerClient::GetInstance()->ChangeAbilityVisibility(token_, isShow); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "ChangeAbilityVisibility is failed %{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed %{public}d", err); } return err; } @@ -1016,7 +1012,7 @@ ErrCode AbilityContextImpl::AddFreeInstallObserver(const sptrAddFreeInstallObserver(token_, observer); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "AddFreeInstallObserver error, ret: %{public}d", ret); + TAG_LOGE(AAFwkTag::CONTEXT, "failed, ret: %{public}d", ret); } return ret; } @@ -1024,11 +1020,11 @@ ErrCode AbilityContextImpl::AddFreeInstallObserver(const sptrOpenAtomicService(want, options, token_, requestCode, -1); if (err != ERR_OK && err != AAFwk::START_ABILITY_WAITING) { - TAG_LOGE(AAFwkTag::CONTEXT, "OpenAtomicService. ret=%{public}d", err); + TAG_LOGE(AAFwkTag::CONTEXT, "failed, ret=%{public}d", err); OnAbilityResultInner(requestCode, err, want); } return err; diff --git a/frameworks/native/ability/ability_runtime/js_extension_context.cpp b/frameworks/native/ability/ability_runtime/js_extension_context.cpp index f8a83536d84..871a1b0a846 100644 --- a/frameworks/native/ability/ability_runtime/js_extension_context.cpp +++ b/frameworks/native/ability/ability_runtime/js_extension_context.cpp @@ -27,24 +27,24 @@ void JsExtensionContext::ConfigurationUpdated(napi_env env, const std::shared_pt const std::shared_ptr &config) { if (env == nullptr || jsContext == nullptr || config == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "engine or jsContext or config is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null engine or jsContext or config"); return; } napi_value object = jsContext->GetNapiValue(); if (!CheckTypeForNapiValue(env, object, napi_object)) { - TAG_LOGE(AAFwkTag::CONTEXT, "object is not object."); + TAG_LOGE(AAFwkTag::CONTEXT, "object is not object"); return; } napi_value method = nullptr; napi_get_named_property(env, object, "onUpdateConfiguration", &method); if (method == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get onUpdateConfiguration from object"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to get onUpdateConfiguration from object"); return; } - TAG_LOGD(AAFwkTag::CONTEXT, "call onUpdateConfiguration."); + TAG_LOGD(AAFwkTag::CONTEXT, "call onUpdateConfiguration"); napi_value argv[] = { CreateJsConfiguration(env, *config) }; napi_call_function(env, object, method, 1, argv, nullptr); } @@ -53,12 +53,12 @@ napi_value CreateJsExtensionContext(napi_env env, const std::shared_ptr abilityInfo) { if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to CreateJsExtensionContext, context is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } napi_value object = CreateJsBaseContext(env, context); if (object == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to CreateJsExtensionContext, object is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null object"); return nullptr; } auto configuration = context->GetConfiguration(); @@ -75,7 +75,7 @@ napi_value CreateJsExtensionContext(napi_env env, const std::shared_ptrextensionInfos.begin(), hapModuleInfo->extensionInfos.end(), isExist); if (infoIter == hapModuleInfo->extensionInfos.end()) { - TAG_LOGE(AAFwkTag::CONTEXT, "Set extensionAbilityInfo fail."); + TAG_LOGE(AAFwkTag::CONTEXT, "set extensionAbilityInfo fail"); } else { napi_set_named_property(env, object, "extensionAbilityInfo", CreateJsExtensionAbilityInfo(env, *infoIter)); } diff --git a/frameworks/native/ability/native/ability_context.cpp b/frameworks/native/ability/native/ability_context.cpp index 5fab3b53e8a..b68971368bd 100644 --- a/frameworks/native/ability/native/ability_context.cpp +++ b/frameworks/native/ability/native/ability_context.cpp @@ -50,7 +50,7 @@ const std::string CALLBACK_KEY = "ohos.ability.params.callback"; ErrCode AbilityContext::StartAbility(const AAFwk::Want &want, int requestCode) { - TAG_LOGD(AAFwkTag::CONTEXT, "requestCode: %{public}d", requestCode); + TAG_LOGD(AAFwkTag::CONTEXT, "requestCode = %{public}d", requestCode); AppExecFwk::AbilityType type = GetAbilityInfoType(); if (type != AppExecFwk::AbilityType::PAGE && type != AppExecFwk::AbilityType::SERVICE) { TAG_LOGE(AAFwkTag::CONTEXT, "abilityType: %{public}d", type); @@ -63,7 +63,8 @@ ErrCode AbilityContext::StartAbility(const AAFwk::Want &want, int requestCode) ErrCode AbilityContext::StartAbility(const Want &want, int requestCode, const AbilityStartSetting &abilityStartSetting) { - TAG_LOGD(AAFwkTag::CONTEXT, "requestCode: %{public}d", requestCode); + TAG_LOGD(AAFwkTag::CONTEXT, "requestCode: %{public}d", + requestCode); AppExecFwk::AbilityType type = GetAbilityInfoType(); if (type != AppExecFwk::AbilityType::PAGE && type != AppExecFwk::AbilityType::SERVICE) { TAG_LOGE(AAFwkTag::CONTEXT, "abilityType: %{public}d", type); @@ -168,7 +169,7 @@ bool AbilityContext::ConnectAbility(const Want &want, const sptrname.c_str()); + TAG_LOGD(AAFwkTag::CONTEXT, "ability:%{public}s", abilityInfo->name.c_str()); if (type != AppExecFwk::AbilityType::PAGE && type != AppExecFwk::AbilityType::SERVICE) { TAG_LOGE(AAFwkTag::CONTEXT, "abilityType: %{public}d", type); @@ -179,7 +180,7 @@ bool AbilityContext::ConnectAbility(const Want &want, const sptr { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); std::shared_ptr info = GetAbilityInfo(); - TAG_LOGI(AAFwkTag::CONTEXT, "called, caller:%{public}s", + TAG_LOGI(AAFwkTag::CONTEXT, "caller:%{public}s", info == nullptr ? "" : info->name.c_str()); AppExecFwk::AbilityType type = GetAbilityInfoType(); if (type != AppExecFwk::AbilityType::PAGE && type != AppExecFwk::AbilityType::SERVICE) { - TAG_LOGE(AAFwkTag::CONTEXT, "AbilityType = %{public}d", type); + TAG_LOGE(AAFwkTag::CONTEXT, "abilityType:%{public}d", type); return ERR_INVALID_VALUE; } ErrCode ret = AAFwk::AbilityManagerClient::GetInstance()->DisconnectAbility(conn); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "error, ret=%{public}d", ret); + TAG_LOGE(AAFwkTag::CONTEXT, "error, ret:%{public}d", ret); } return ret; } diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_connect_callback_object.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_connect_callback_object.cpp index ae655b18a2e..33bd6a34588 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_connect_callback_object.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_connect_callback_object.cpp @@ -26,9 +26,9 @@ CJAbilityConnectCallbackFuncs* g_cjAbilityConnectCallbackFuncs = nullptr; void RegisterCJAbilityConnectCallbackFuncs(void (*registerFunc)(CJAbilityConnectCallbackFuncs* result)) { - TAG_LOGD(AAFwkTag::CONTEXT, "RegisterCJAbilityConnectCallbackFuncs start."); + TAG_LOGD(AAFwkTag::CONTEXT, "start"); if (g_cjAbilityConnectCallbackFuncs != nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Repeated registration for cangjie functions of CJAbilityConnectCallback."); + TAG_LOGE(AAFwkTag::CONTEXT, "not null cangjie callback"); return; } @@ -39,7 +39,7 @@ void RegisterCJAbilityConnectCallbackFuncs(void (*registerFunc)(CJAbilityConnect CJAbilityConnectCallback::~CJAbilityConnectCallback() { if (g_cjAbilityConnectCallbackFuncs == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Cangjie functions for CJAbilityConnectCallbacks are not registered"); + TAG_LOGE(AAFwkTag::CONTEXT, "null cangjie callback"); return; } g_cjAbilityConnectCallbackFuncs->release(callbackId_); @@ -48,9 +48,9 @@ CJAbilityConnectCallback::~CJAbilityConnectCallback() void CJAbilityConnectCallback::OnAbilityConnectDone( const AppExecFwk::ElementName& element, const sptr& remoteObject, int resultCode) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnAbilityConnectDone begin, resultCode:%{public}d", resultCode); + TAG_LOGD(AAFwkTag::CONTEXT, "called, resultCode:%{public}d", resultCode); if (g_cjAbilityConnectCallbackFuncs == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Cangjie functions for CJAbilityConnectCallbacks are not registered"); + TAG_LOGE(AAFwkTag::CONTEXT, "cangjie functions for CJAbilityConnectCallbacks are not registered"); return; } @@ -62,9 +62,9 @@ void CJAbilityConnectCallback::OnAbilityConnectDone( void CJAbilityConnectCallback::OnAbilityDisconnectDone(const AppExecFwk::ElementName& element, int resultCode) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnAbilityDisconnectDone begin, resultCode:%{public}d", resultCode); + TAG_LOGD(AAFwkTag::CONTEXT, "called, resultCode:%{public}d", resultCode); if (g_cjAbilityConnectCallbackFuncs == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Cangjie functions for CJAbilityConnectCallbacks are not registered"); + TAG_LOGE(AAFwkTag::CONTEXT, "null cangjie callback"); return; } diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_context.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_context.cpp index 6c942a089ef..2fa11ebd07d 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_context.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_context.cpp @@ -30,7 +30,7 @@ std::shared_ptr CJAbilityContext::GetAbilityCont sptr CJAbilityContext::GetToken() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } return context_->GetToken(); @@ -39,7 +39,7 @@ sptr CJAbilityContext::GetToken() std::string CJAbilityContext::GetPreferencesDir() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ""; } return context_->GetPreferencesDir(); @@ -48,7 +48,7 @@ std::string CJAbilityContext::GetPreferencesDir() std::string CJAbilityContext::GetDatabaseDir() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ""; } return context_->GetDatabaseDir(); @@ -57,7 +57,7 @@ std::string CJAbilityContext::GetDatabaseDir() std::string CJAbilityContext::GetBundleName() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ""; } return context_->GetBundleName(); @@ -66,7 +66,7 @@ std::string CJAbilityContext::GetBundleName() int32_t CJAbilityContext::GetArea() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->GetArea(); @@ -75,7 +75,7 @@ int32_t CJAbilityContext::GetArea() std::shared_ptr CJAbilityContext::GetAbilityInfo() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } return context_->GetAbilityInfo(); @@ -84,7 +84,7 @@ std::shared_ptr CJAbilityContext::GetAbilityInfo() std::shared_ptr CJAbilityContext::GetHapModuleInfo() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } return context_->GetHapModuleInfo(); @@ -93,7 +93,7 @@ std::shared_ptr CJAbilityContext::GetHapModuleInfo() std::shared_ptr CJAbilityContext::GetConfiguration() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return nullptr; } return context_->GetConfiguration(); @@ -102,7 +102,7 @@ std::shared_ptr CJAbilityContext::GetConfiguration() int32_t CJAbilityContext::StartAbility(const AAFwk::Want& want) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } // -1 is default accountId which is the same as js. @@ -112,7 +112,7 @@ int32_t CJAbilityContext::StartAbility(const AAFwk::Want& want) int32_t CJAbilityContext::StartAbility(const AAFwk::Want& want, const AAFwk::StartOptions& startOptions) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartAbility(want, startOptions, -1); @@ -121,7 +121,7 @@ int32_t CJAbilityContext::StartAbility(const AAFwk::Want& want, const AAFwk::Sta int32_t CJAbilityContext::StartAbilityWithAccount(const AAFwk::Want& want, int32_t accountId) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartAbilityWithAccount(want, accountId, -1); @@ -131,7 +131,7 @@ int32_t CJAbilityContext::StartAbilityWithAccount( const AAFwk::Want& want, int32_t accountId, const AAFwk::StartOptions& startOptions) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartAbilityWithAccount(want, accountId, startOptions, -1); @@ -140,7 +140,7 @@ int32_t CJAbilityContext::StartAbilityWithAccount( int32_t CJAbilityContext::StartServiceExtensionAbility(const Want& want) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartServiceExtensionAbility(want); @@ -149,7 +149,7 @@ int32_t CJAbilityContext::StartServiceExtensionAbility(const Want& want) int32_t CJAbilityContext::StartServiceExtensionAbilityWithAccount(const Want& want, int32_t accountId) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartServiceExtensionAbility(want, accountId); @@ -158,7 +158,7 @@ int32_t CJAbilityContext::StartServiceExtensionAbilityWithAccount(const Want& wa int32_t CJAbilityContext::StopServiceExtensionAbility(const Want& want) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StopServiceExtensionAbility(want); @@ -167,7 +167,7 @@ int32_t CJAbilityContext::StopServiceExtensionAbility(const Want& want) int32_t CJAbilityContext::StopServiceExtensionAbilityWithAccount(const Want& want, int32_t accountId) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StopServiceExtensionAbility(want, accountId); @@ -176,7 +176,7 @@ int32_t CJAbilityContext::StopServiceExtensionAbilityWithAccount(const Want& wan int32_t CJAbilityContext::TerminateSelf() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->TerminateSelf(); @@ -185,7 +185,7 @@ int32_t CJAbilityContext::TerminateSelf() int32_t CJAbilityContext::TerminateSelfWithResult(const AAFwk::Want& want, int32_t resultCode) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->TerminateAbilityWithResult(want, resultCode); @@ -194,7 +194,7 @@ int32_t CJAbilityContext::TerminateSelfWithResult(const AAFwk::Want& want, int32 std::tuple CJAbilityContext::IsTerminating() { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return std::make_tuple(ERR_INVALID_INSTANCE_CODE, false); } return std::make_tuple(SUCCESS_CODE, context_->IsTerminating()); @@ -203,7 +203,7 @@ std::tuple CJAbilityContext::IsTerminating() bool CJAbilityContext::ConnectAbility(const AAFwk::Want& want, int64_t connectionId) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } auto connection = new CJAbilityConnectCallback(connectionId); @@ -214,7 +214,7 @@ int32_t CJAbilityContext::ConnectAbilityWithAccount( const AAFwk::Want& want, int32_t accountId, int64_t connectionId) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } auto connection = new CJAbilityConnectCallback(connectionId); @@ -224,7 +224,7 @@ int32_t CJAbilityContext::ConnectAbilityWithAccount( void CJAbilityContext::DisconnectAbility(const AAFwk::Want& want, int64_t connectionId) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return; } auto connection = new CJAbilityConnectCallback(connectionId); @@ -234,7 +234,7 @@ void CJAbilityContext::DisconnectAbility(const AAFwk::Want& want, int64_t connec int32_t CJAbilityContext::StartAbilityForResult(const AAFwk::Want& want, int32_t requestCode, RuntimeTask&& task) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartAbilityForResult(want, requestCode, std::move(task)); @@ -244,7 +244,7 @@ int32_t CJAbilityContext::StartAbilityForResult( const AAFwk::Want& want, const AAFwk::StartOptions& startOptions, int32_t requestCode, RuntimeTask&& task) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartAbilityForResult(want, startOptions, requestCode, std::move(task)); @@ -254,7 +254,7 @@ int32_t CJAbilityContext::StartAbilityForResultWithAccount( const AAFwk::Want& want, int32_t accountId, int32_t requestCode, RuntimeTask&& task) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartAbilityForResultWithAccount(want, accountId, requestCode, std::move(task)); @@ -264,7 +264,7 @@ int32_t CJAbilityContext::StartAbilityForResultWithAccount(const AAFwk::Want& wa const AAFwk::StartOptions& startOptions, int32_t requestCode, RuntimeTask&& task) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->StartAbilityForResultWithAccount(want, accountId, startOptions, requestCode, std::move(task)); @@ -274,7 +274,7 @@ int32_t CJAbilityContext::RequestPermissionsFromUser( AppExecFwk::Ability* ability, std::vector& permissions, PermissionRequestTask&& task) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return SUCCESS_CODE; @@ -284,7 +284,7 @@ int32_t CJAbilityContext::RequestPermissionsFromUser( int32_t CJAbilityContext::SetMissionLabel(const std::string& label) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->SetMissionLabel(label); @@ -293,7 +293,7 @@ int32_t CJAbilityContext::SetMissionLabel(const std::string& label) int32_t CJAbilityContext::SetMissionIcon(const std::shared_ptr& icon) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->SetMissionIcon(icon); @@ -302,7 +302,7 @@ int32_t CJAbilityContext::SetMissionIcon(const std::shared_ptrGetCurrentWindowMode(); @@ -310,15 +310,14 @@ void CJAbilityContext::InheritWindowMode(AAFwk::Want& want) windowMode == AAFwk::AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_SECONDARY) { want.SetParam(Want::PARAM_RESV_WINDOW_MODE, windowMode); } - TAG_LOGD(AAFwkTag::CONTEXT, - "CJAbilityContext::InheritWindowMode called end. window mode is %{public}d", windowMode); + TAG_LOGD(AAFwkTag::CONTEXT, "end, window mode is %{public}d", windowMode); #endif } int32_t CJAbilityContext::RequestDialogService(AAFwk::Want& want, RequestDialogResultTask&& task) { if (context_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return context_->RequestDialogService(want, std::move(task)); diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_context_object.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_context_object.cpp index 2fbe608d405..cbd7ca3db27 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_context_object.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_context_object.cpp @@ -40,7 +40,7 @@ CJAbilityCallbacks* g_cjAbilityCallbacks = nullptr; void UnWrapStartOption(CJStartOptions* source, AAFwk::StartOptions& target) { if (source == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "UnWrapStartOption failed, source is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null source"); return; } target.SetWindowMode(source->windowMode); @@ -51,11 +51,11 @@ std::function WrapCJAbilityResultTask(int64_t l { auto cjTask = [lambdaId](int32_t error, CJAbilityResult* abilityResult) { if (g_cjAbilityCallbacks == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResult failed, cangjie callbacks are not registered"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed, cangjie callbacks are not registered"); return; } g_cjAbilityCallbacks->invokeAbilityResultCallback(lambdaId, error, abilityResult); - TAG_LOGD(AAFwkTag::CONTEXT, "WrapCJAbilityResultTask: error is %{public}d", error); + TAG_LOGD(AAFwkTag::CONTEXT, "error: %{public}d", error); }; return cjTask; } @@ -66,7 +66,7 @@ RuntimeTask WrapRuntimeTask(std::function cjTas WantHandle wantHandle = const_cast(&want); CJAbilityResult abilityResult = { resultCode, wantHandle }; cjTask(error, &abilityResult); - TAG_LOGD(AAFwkTag::CONTEXT, "WrapRuntimeTask: error is %{public}d", error); + TAG_LOGD(AAFwkTag::CONTEXT, "error: %{public}d", error); }; return task; } @@ -75,12 +75,12 @@ extern "C" { void RegisterCJAbilityCallbacks(void (*registerFunc)(CJAbilityCallbacks*)) { if (g_cjAbilityCallbacks != nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Repeated registration for cj functions of CJAbility."); + TAG_LOGE(AAFwkTag::CONTEXT, "repeated registration for cj functions of CJAbility"); return; } if (registerFunc == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "RegisterCJAbilityCallbacks failed, registerFunc is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null registerFunc"); return; } @@ -102,7 +102,7 @@ int64_t FFIAbilityContextGetAbilityInfo(int64_t id) { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "GetAbilityInfo failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return INVALID_DATA_ID; } return NOT_SUPPORT; @@ -112,7 +112,7 @@ int64_t FFIAbilityContextGetHapModuleInfo(int64_t id) { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "GetHapModuleInfo failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return INVALID_DATA_ID; } auto hapModuleInfo = context->GetHapModuleInfo(); @@ -123,7 +123,7 @@ int64_t FFIAbilityContextGetConfiguration(int64_t id) { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "GetConfiguration failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return INVALID_DATA_ID; } auto configuration = context->GetConfiguration(); @@ -134,7 +134,7 @@ int32_t FFIAbilityContextStartAbility(int64_t id, WantHandle want) { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbility failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } @@ -147,7 +147,7 @@ int32_t FFIAbilityContextStartAbilityWithOption(int64_t id, WantHandle want, CJS { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbility failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -161,7 +161,7 @@ int32_t FFIAbilityContextStartAbilityWithAccount(int64_t id, WantHandle want, in { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityWithAccount failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -174,7 +174,7 @@ int32_t FFIAbilityContextStartAbilityWithAccountAndOption( { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityWithAccount failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -188,7 +188,7 @@ int32_t FFIAbilityContextStartServiceExtensionAbility(int64_t id, WantHandle wan { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartServiceExtensionAbility failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -199,7 +199,7 @@ int32_t FFIAbilityContextStartServiceExtensionAbilityWithAccount(int64_t id, Wan { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartServiceExtensionAbilityWithAccount failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -210,7 +210,7 @@ int32_t FFIAbilityContextStopServiceExtensionAbility(int64_t id, WantHandle want { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StopServiceExtensionAbility failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -221,7 +221,7 @@ int32_t FFIAbilityContextStopServiceExtensionAbilityWithAccount(int64_t id, Want { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StopServiceExtensionAbilityWithAccount failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -232,7 +232,7 @@ int32_t FFIAbilityContextTerminateSelf(int64_t id) { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "TerminateSelf failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } return context->TerminateSelf(); @@ -242,7 +242,7 @@ int32_t FFIAbilityContextTerminateSelfWithResult(int64_t id, WantHandle want, in { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "TerminateSelfWithResult failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -254,7 +254,7 @@ RetDataBool FFIAbilityContextIsTerminating(int64_t id) RetDataBool res = { ERR_INVALID_INSTANCE_CODE, false }; auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "IsTerminating failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return res; } @@ -268,7 +268,7 @@ int32_t FFIAbilityContextConnectAbility(int64_t id, WantHandle want, int64_t con { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ConnectAbility failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -280,7 +280,7 @@ int32_t FFIAbilityContextConnectAbilityWithAccount(int64_t id, WantHandle want, { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ConnectAbility failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -292,7 +292,7 @@ int32_t FFIAbilityContextDisconnectAbility(int64_t id, WantHandle want, int64_t { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ConnectAbility failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); return ERR_INVALID_INSTANCE_CODE; } auto actualWant = reinterpret_cast(want); @@ -307,7 +307,7 @@ int32_t FFIAbilityContextStartAbilityForResult(int64_t id, WantHandle want, int3 auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResult failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); cjTask(ERR_INVALID_INSTANCE_CODE, nullptr); return ERR_INVALID_INSTANCE_CODE; } @@ -325,7 +325,7 @@ int32_t FFIAbilityContextStartAbilityForResultWithOption( auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResult failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); cjTask(ERR_INVALID_INSTANCE_CODE, nullptr); return ERR_INVALID_INSTANCE_CODE; } @@ -345,7 +345,7 @@ int32_t FFIAbilityContextStartAbilityForResultWithAccount( auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResult failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid id of cj ability context"); cjTask(ERR_INVALID_INSTANCE_CODE, nullptr); return ERR_INVALID_INSTANCE_CODE; } @@ -363,7 +363,7 @@ int32_t FFIAbilityContextStartAbilityForResultWithAccountAndOption( auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "StartAbilityForResult failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); cjTask(ERR_INVALID_INSTANCE_CODE, nullptr); return ERR_INVALID_INSTANCE_CODE; } @@ -380,11 +380,11 @@ int32_t FFIAbilityContextRequestPermissionsFromUser( { auto cjTask = [lambdaId](int32_t error, CJPermissionRequestResult* cjPermissionRequestResult) { if (g_cjAbilityCallbacks == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "RequestPermissionsFromUser failed, cangjie callbacks are not registered"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed, cangjie callbacks are not registered"); return; } g_cjAbilityCallbacks->invokePermissionRequestResultCallback(lambdaId, error, cjPermissionRequestResult); - TAG_LOGD(AAFwkTag::CONTEXT, "RequestPermissionsFromUser callback is called, error is %{public}d", error); + TAG_LOGD(AAFwkTag::CONTEXT, "invoke, error is %{public}d", error); }; PermissionRequestTask task = [cjTask](const std::vector& permissions, const std::vector& grantResults) { @@ -396,14 +396,14 @@ int32_t FFIAbilityContextRequestPermissionsFromUser( auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "RequestPermissionsFromUser failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "null CJAbilityContext"); cjTask(ERR_INVALID_INSTANCE_CODE, nullptr); return ERR_INVALID_INSTANCE_CODE; } auto actualPermissions = reinterpret_cast*>(permissions); if (actualPermissions->empty()) { - TAG_LOGE(AAFwkTag::CONTEXT, "Params do not meet specification, permissions is empty."); + TAG_LOGE(AAFwkTag::CONTEXT, "params do not meet specification, permissions is empty"); cjTask(ERR_INVALID_INSTANCE_CODE, nullptr); return ERR_INVALID_INSTANCE_CODE; } @@ -415,7 +415,7 @@ int32_t FFIAbilityContextSetMissionLabel(int64_t id, const char* label) { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "SetMissionLabel failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "null CJAbilityContext"); return ERR_INVALID_INSTANCE_CODE; } return context->SetMissionLabel(label); @@ -425,7 +425,7 @@ int32_t FFIAbilityContextSetMissionIcon(int64_t id, int64_t pixelMapId) { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "SetMissionIcon failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return ERR_INVALID_INSTANCE_CODE; } return 0; @@ -436,12 +436,12 @@ int32_t FFIAbilityContextRequestDialogService(int64_t id, WantHandle want, int64 { auto context = FFIData::GetData(id); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "RequestDialogService failed, invalid id of CJAbilityContext"); + TAG_LOGE(AAFwkTag::CONTEXT, "null CJAbilityContext"); return ERR_INVALID_INSTANCE_CODE; } RequestDialogResultTask task = [lambdaId](int32_t resultCode, const AAFwk::Want &resultWant) { if (g_cjAbilityCallbacks == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "RequestDialogService failed, cangjie callbacks are not registered"); + TAG_LOGE(AAFwkTag::CONTEXT, "null g_cjAbilityCallbacks"); return; } CJDialogRequestResult dialogRequestResult = { @@ -449,7 +449,7 @@ int32_t FFIAbilityContextRequestDialogService(int64_t id, WantHandle want, int64 .wantHandle = (WantHandle)&resultWant }; g_cjAbilityCallbacks->invokeDialogRequestResultCallback(lambdaId, resultCode, &dialogRequestResult); - TAG_LOGD(AAFwkTag::CONTEXT, "RequestDialogService callback is called, resultCode is %{public}d", resultCode); + TAG_LOGD(AAFwkTag::CONTEXT, "invoke, resultCode is %{public}d", resultCode); }; auto actualWant = reinterpret_cast(want); return context->RequestDialogService(*actualWant, std::move(task)); @@ -504,7 +504,7 @@ EXPORT napi_value FFICreateNapiValue(void *env, void *context) napi_value result = nullptr; napi_create_object((napi_env)env, &result); if (result == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "FFICreateNapiValue create object failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "null result"); return nullptr; } auto nativeFinalize = [](napi_env env, void* data, void* hint) { diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_ffi.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_ffi.cpp index 5f7d2ecfe51..40612261580 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_ffi.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_ffi.cpp @@ -26,13 +26,13 @@ extern "C" { int64_t FFIAbilityGetAbilityContext(AbilityHandle abilityHandle) { if (abilityHandle == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ability handle is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null abilityHandle"); return ERR_INVALID_INSTANCE_CODE; } auto ability = static_cast(abilityHandle); auto context = ability->GetAbilityContext(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "GetAbilityContext failed, abilityContext is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null abilityContext"); return ERR_INVALID_INSTANCE_CODE; } auto cjContext = FFI::FFIData::Create(context); @@ -43,12 +43,12 @@ void FFIAbilityContextGetFilesDir(int64_t id, void(*accept)(const char*)) { auto cjContext = FFI::FFIData::GetData(id); if (cjContext == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "cj abilityContext is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null cj abilityContext"); return; } auto context = cjContext->GetAbilityContext(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return; } auto filesDir = context->GetFilesDir(); 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 7cd896af47e..309ea5e9692 100644 --- a/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp +++ b/frameworks/native/ability/native/ability_runtime/js_ability_context.cpp @@ -81,7 +81,7 @@ void RemoveConnection(int64_t connectId) return connectId == obj.first.id; }); if (item != g_connects.end()) { - TAG_LOGD(AAFwkTag::CONTEXT, "remove connection ability exist."); + TAG_LOGD(AAFwkTag::CONTEXT, "remove connection ability exist"); if (item->second) { item->second->RemoveConnectionObject(); } @@ -95,7 +95,7 @@ int64_t InsertConnection(sptr connection, const AAFwk::Want { std::lock_guard lock(gConnectsLock_); if (connection == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "connection null"); + TAG_LOGE(AAFwkTag::CONTEXT, "null connection"); return -1; } int64_t connectId = g_serialNumber; @@ -126,24 +126,23 @@ void GenerateCallerCallBack(std::shared_ptr calls, std::shared_ptr callerCallBack) { if (calls == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "calls is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null calls"); return; } if (callerCallBack == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "callerCallBack is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null callerCallBack"); return; } auto callBackDone = [calldata = calls] (const sptr &obj) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityByCall callBackDone mutexlock"); + TAG_LOGD(AAFwkTag::CONTEXT, "callBackDone called start"); std::unique_lock lock(calldata->mutexlock); - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityByCall callBackDone remoteCallee assignment"); calldata->remoteCallee = obj; calldata->condition.notify_all(); - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityByCall callBackDone is called end"); + TAG_LOGD(AAFwkTag::CONTEXT, "callBackDone called end"); }; auto releaseListen = [](const std::string &str) { - TAG_LOGI(AAFwkTag::CONTEXT, "OnStartAbilityByCall releaseListen is called %{public}s", str.c_str()); + TAG_LOGI(AAFwkTag::CONTEXT, "releaseListen is called %{public}s", str.c_str()); }; callerCallBack->SetCallBack(callBackDone); @@ -153,36 +152,36 @@ void GenerateCallerCallBack(std::shared_ptr calls, void StartAbilityByCallExecuteDone(std::shared_ptr calldata) { if (calldata == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "calldata is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null calldata"); return; } std::unique_lock lock(calldata->mutexlock); if (calldata->remoteCallee != nullptr) { - TAG_LOGI(AAFwkTag::CONTEXT, "OnStartAbilityByCall callExecute callee isn`t nullptr"); + TAG_LOGI(AAFwkTag::CONTEXT, "not null callExecute callee"); return; } if (calldata->condition.wait_for(lock, std::chrono::seconds(CALLER_TIME_OUT)) == std::cv_status::timeout) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnStartAbilityByCall callExecute waiting callee timeout"); + TAG_LOGE(AAFwkTag::CONTEXT, "callExecute waiting callee timeout"); calldata->err = -1; } - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityByCall callExecute end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); } void StartAbilityByCallComplete(napi_env env, NapiAsyncTask& task, std::weak_ptr abilityContext, std::shared_ptr calldata, std::shared_ptr callerCallBack) { if (calldata == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "calldata is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null calldata"); return; } if (calldata->err != 0) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnStartAbilityByCall callComplete err is %{public}d", calldata->err); + TAG_LOGE(AAFwkTag::CONTEXT, "callComplete err is %{public}d", calldata->err); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INNER)); TAG_LOGD(AAFwkTag::CONTEXT, "clear failed call of startup is called"); auto context = abilityContext.lock(); if (context == nullptr || callerCallBack == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "clear failed call of startup input param is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context or callBack"); return; } context->ClearFailedCallConnection(callerCallBack); @@ -190,22 +189,22 @@ void StartAbilityByCallComplete(napi_env env, NapiAsyncTask& task, std::weak_ptr } auto context = abilityContext.lock(); if (context == nullptr || callerCallBack == nullptr || calldata->remoteCallee == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnStartAbilityByCall callComplete params error %{public}s is nullptr", + TAG_LOGE(AAFwkTag::CONTEXT, "null callComplete params error %{public}s", context == nullptr ? "context" : (calldata->remoteCallee == nullptr ? "remoteCallee" : "callerCallBack")); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INNER)); - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityByCall callComplete end"); + TAG_LOGD(AAFwkTag::CONTEXT, "callComplete end"); return; } auto releaseCallAbilityFunc = [abilityContext] (const std::shared_ptr &callback) -> ErrCode { auto contextForRelease = abilityContext.lock(); if (contextForRelease == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "releaseCallAbilityFunction, context is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null releaseCallAbilityFunction"); return -1; } return contextForRelease->ReleaseCall(callback); }; task.Resolve(env, CreateJsCallerComplex(env, releaseCallAbilityFunc, calldata->remoteCallee, callerCallBack)); - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityByCall callComplete end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); } } @@ -378,10 +377,10 @@ napi_value JsAbilityContext::DisconnectUIServiceExtension(napi_env env, napi_cal void JsAbilityContext::ClearFailedCallConnection( const std::weak_ptr& abilityContext, const std::shared_ptr &callback) { - TAG_LOGD(AAFwkTag::CONTEXT, "clear failed call of startup is called"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); auto context = abilityContext.lock(); if (context == nullptr || callback == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "clear failed call of startup input param is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context or callback"); return; } @@ -394,7 +393,7 @@ napi_value JsAbilityContext::OnStartAbility(napi_env env, NapiCallbackInfo& info HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (info.argc == ARGC_ZERO) { - TAG_LOGE(AAFwkTag::CONTEXT, "Not enough arguments"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid arg"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -406,20 +405,20 @@ napi_value JsAbilityContext::OnStartAbility(napi_env env, NapiCallbackInfo& info } InheritWindowMode(want); decltype(info.argc) unwrapArgc = ARGC_ONE; - TAG_LOGD(AAFwkTag::CONTEXT, "ability:%{public}s.", want.GetElement().GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::CONTEXT, "ability:%{public}s", want.GetElement().GetAbilityName().c_str()); AAFwk::StartOptions startOptions; if (info.argc > ARGC_ONE && CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_object)) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbility start options is used."); + TAG_LOGD(AAFwkTag::CONTEXT, "start options is used"); if (!AppExecFwk::UnwrapStartOptionsWithProcessOption(env, info.argv[INDEX_ONE], startOptions)) { ThrowInvalidParamError(env, "Parse param startOptions failed, startOptions must be StartOptions."); - TAG_LOGE(AAFwkTag::CONTEXT, "unwrap startOptions failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid options"); return CreateJsUndefined(env); } unwrapArgc++; } if (isStartRecent) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartRecentAbility is enter"); + TAG_LOGD(AAFwkTag::CONTEXT, "startRecentAbility"); want.SetParam(Want::PARAM_RESV_START_RECENT, true); } @@ -452,7 +451,7 @@ napi_value JsAbilityContext::OnStartAbility(napi_env env, NapiCallbackInfo& info NapiAsyncTask::CompleteCallback complete = [innerErrorCode](napi_env env, NapiAsyncTask& task, int32_t status) { if (*innerErrorCode == 0) { - TAG_LOGD(AAFwkTag::CONTEXT, "StartAbility success."); + TAG_LOGD(AAFwkTag::CONTEXT, "startAbility success"); task.Resolve(env, CreateJsUndefined(env)); } else { task.Reject(env, CreateJsErrorByNativeErr(env, *innerErrorCode)); @@ -474,7 +473,7 @@ napi_value JsAbilityContext::OnStartAbility(napi_env env, NapiCallbackInfo& info napi_value JsAbilityContext::OnStartUIServiceExtension(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "StartUIServiceExtension"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); if (info.argc < ARGC_ONE) { ThrowTooFewParametersError(env); return CreateJsUndefined(env); @@ -482,7 +481,7 @@ napi_value JsAbilityContext::OnStartUIServiceExtension(napi_env env, NapiCallbac AAFwk::Want want; if (!AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to parse want!"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid want"); ThrowInvalidParamError(env, "Parse param want failed, want must be Want."); return CreateJsUndefined(env); } @@ -536,11 +535,11 @@ bool JsAbilityContext::UnwrapConnectUIServiceExtensionParam(napi_env env, NapiCa bool JsAbilityContext::CheckConnectAlreadyExist(napi_env env, AAFwk::Want& want, napi_value callback, napi_value& result) { - TAG_LOGI(AAFwkTag::UISERVC_EXT, "called"); + TAG_LOGD(AAFwkTag::UISERVC_EXT, "called"); sptr connection = nullptr; UIServiceConnection::FindUIServiceAbilityConnection(env, want, callback, connection); if (connection == nullptr) { - TAG_LOGE(AAFwkTag::UISERVC_EXT, "connection == nullptr"); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "null connection"); return false; } @@ -550,7 +549,7 @@ bool JsAbilityContext::CheckConnectAlreadyExist(napi_env env, TAG_LOGW(AAFwkTag::UISERVC_EXT, "can't got proxy object, wait for duplicated connect finish"); connection->AddDuplicatedPendingTask(uasyncTask); } else { - TAG_LOGI(AAFwkTag::UISERVC_EXT, "Resolve, got proxy object"); + TAG_LOGD(AAFwkTag::UISERVC_EXT, "resolve, got proxy object"); uasyncTask->ResolveWithNoError(env, proxy); } return true; @@ -562,7 +561,7 @@ napi_value JsAbilityContext::OnConnectUIServiceExtension(napi_env env, NapiCallb AAFwk::Want want; bool unwrapResult = UnwrapConnectUIServiceExtensionParam(env, info, want); if (!unwrapResult) { - TAG_LOGE(AAFwkTag::UISERVC_EXT, "UnwrapConnectUIServiceExtensionParam failed"); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "unwrap params failed"); return CreateJsUndefined(env); } napi_value callbackObject = nullptr; @@ -611,7 +610,7 @@ void JsAbilityContext::DoConnectUIServiceExtension(napi_env env, uint64_t connectId = connection->GetConnectionId(); auto context = weakContext.lock(); if (!context) { - TAG_LOGE(AAFwkTag::CONTEXT, "Connect ability failed, context is released."); + TAG_LOGE(AAFwkTag::CONTEXT, "connect ability failed, context is released."); uasyncTaskShared->Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); UIServiceConnection::RemoveUIServiceAbilityConnection(connectId); return; @@ -620,7 +619,7 @@ void JsAbilityContext::DoConnectUIServiceExtension(napi_env env, auto innerErrorCode = context->ConnectAbility(want, connection); AbilityErrorCode errcode = AbilityRuntime::GetJsErrorCodeByNativeError(innerErrorCode); if (errcode != AbilityErrorCode::ERROR_OK) { - TAG_LOGE(AAFwkTag::UISERVC_EXT, "ConnectAbility failed, errcode is %{public}d.", errcode); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "failed, errcode is %{public}d.", errcode); uasyncTaskShared->Reject(env, CreateJsError(env, errcode)); UIServiceConnection::RemoveUIServiceAbilityConnection(connectId); } @@ -652,11 +651,11 @@ napi_value JsAbilityContext::OnDisconnectUIServiceExtension(napi_env env, NapiCa napi_env env, NapiAsyncTask& task, int32_t status) { auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::UISERVC_EXT, "OnDisconnectUIServiceExtension context is released"); + TAG_LOGW(AAFwkTag::UISERVC_EXT, "onDisconnectUIServiceExtension context is released"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); UIServiceConnection::RemoveUIServiceAbilityConnection(connectId); } else if (!connection) { - TAG_LOGW(AAFwkTag::UISERVC_EXT, "OnDisconnectUIServiceExtension connection nullptr"); + TAG_LOGW(AAFwkTag::UISERVC_EXT, "onDisconnectUIServiceExtension connection nullptr"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INNER)); UIServiceConnection::RemoveUIServiceAbilityConnection(connectId); } else { @@ -694,7 +693,7 @@ bool JsAbilityContext::CreateOpenLinkTask(const napi_env &env, const napi_value CreateAsyncTaskWithLastParam(env, lastParam, nullptr, nullptr, &result); std::shared_ptr asyncTask = std::move(uasyncTask); RuntimeTask task = [env, asyncTask](int resultCode, const AAFwk::Want& want, bool isInner) { - TAG_LOGI(AAFwkTag::CONTEXT, "OnOpenLink async callback is begin"); + TAG_LOGD(AAFwkTag::CONTEXT, "start onOpenLink async callback"); HandleScope handleScope(env); napi_value abilityResult = AppExecFwk::WrapAbilityResult(env, resultCode, want); if (abilityResult == nullptr) { @@ -739,12 +738,12 @@ static bool ParseOpenLinkParams(const napi_env &env, const NapiCallbackInfo &inf return false; } if (!ConvertFromJsValue(env, info.argv[ARGC_ZERO], linkValue) || !CheckUrl(linkValue)) { - TAG_LOGE(AAFwkTag::CONTEXT, "link parameter invalid"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid link parames"); return false; } if (CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_object)) { - TAG_LOGD(AAFwkTag::CONTEXT, "OpenLinkOptions is used."); + TAG_LOGD(AAFwkTag::CONTEXT, "openLinkOptions is used"); if (!AppExecFwk::UnwrapOpenLinkOptions(env, info.argv[INDEX_ONE], openLinkOptions, want)) { TAG_LOGE(AAFwkTag::CONTEXT, "openLinkOptions parse failed"); return false; @@ -758,7 +757,7 @@ napi_value JsAbilityContext::OnOpenLink(napi_env env, NapiCallbackInfo& info) { StartAsyncTrace(HITRACE_TAG_ABILITY_MANAGER, TRACE_ATOMIC_SERVICE, TRACE_ATOMIC_SERVICE_ID); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::CONTEXT, "OnOpenLink"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); std::string linkValue(""); AAFwk::OpenLinkOptions openLinkOptions; @@ -779,7 +778,7 @@ napi_value JsAbilityContext::OnOpenLink(napi_env env, NapiCallbackInfo& info) int requestCode = -1; if (CheckTypeForNapiValue(env, info.argv[INDEX_TWO], napi_function)) { - TAG_LOGD(AAFwkTag::CONTEXT, "completionHandler is used."); + TAG_LOGD(AAFwkTag::CONTEXT, "completionHandler is used"); CreateOpenLinkTask(env, info.argv[INDEX_TWO], want, requestCode); } return OnOpenLinkInner(env, want, requestCode, startTime, linkValue); @@ -802,20 +801,20 @@ napi_value JsAbilityContext::OnOpenLinkInner(napi_env env, const AAFwk::Want& wa NapiAsyncTask::CompleteCallback complete = [innerErrorCode, requestCode, startTime, url, this]( napi_env env, NapiAsyncTask& task, int32_t status) { if (*innerErrorCode == 0) { - TAG_LOGI(AAFwkTag::CONTEXT, "OpenLink succeeded."); + TAG_LOGE(AAFwkTag::CONTEXT, "openLink succeeded"); return; } if (freeInstallObserver_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "freeInstallObserver_ is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null freeInstallObserver_"); RemoveOpenLinkTask(requestCode); return; } if (*innerErrorCode == AAFwk::ERR_OPEN_LINK_START_ABILITY_DEFAULT_OK) { - TAG_LOGI(AAFwkTag::CONTEXT, "start ability by default succeeded."); + TAG_LOGE(AAFwkTag::CONTEXT, "start ability by default succeeded"); freeInstallObserver_->OnInstallFinishedByUrl(startTime, url, ERR_OK); return; } - TAG_LOGI(AAFwkTag::CONTEXT, "OpenLink failed."); + TAG_LOGI(AAFwkTag::CONTEXT, "failed"); freeInstallObserver_->OnInstallFinishedByUrl(startTime, url, *innerErrorCode); RemoveOpenLinkTask(requestCode); }; @@ -833,7 +832,7 @@ napi_value JsAbilityContext::OnStartAbilityAsCaller(napi_env env, NapiCallbackIn HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (info.argc == ARGC_ZERO) { - TAG_LOGE(AAFwkTag::CONTEXT, "Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -846,11 +845,11 @@ napi_value JsAbilityContext::OnStartAbilityAsCaller(napi_env env, NapiCallbackIn } InheritWindowMode(want); decltype(info.argc) unwrapArgc = ARGC_ONE; - TAG_LOGI(AAFwkTag::CONTEXT, "StartAbilityAsCaller, ability:%{public}s.", + TAG_LOGI(AAFwkTag::CONTEXT, "ability:%{public}s", want.GetElement().GetAbilityName().c_str()); AAFwk::StartOptions startOptions; if (info.argc > ARGC_ONE && CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_object)) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityAsCaller start options is used."); + TAG_LOGD(AAFwkTag::CONTEXT, "start, options is used"); AppExecFwk::UnwrapStartOptions(env, info.argv[INDEX_ONE], startOptions); unwrapArgc++; } @@ -893,18 +892,18 @@ napi_value JsAbilityContext::OnStartAbilityWithAccount(napi_env env, NapiCallbac OHOS::AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want); InheritWindowMode(want); decltype(info.argc) unwrapArgc = ARGC_ONE; - TAG_LOGI(AAFwkTag::CONTEXT, "StartAbilityWithAccount, ability:%{public}s", + TAG_LOGI(AAFwkTag::CONTEXT, "ability:%{public}s", want.GetElement().GetAbilityName().c_str()); int32_t accountId = 0; if (!OHOS::AppExecFwk::UnwrapInt32FromJS2(env, info.argv[INDEX_ONE], accountId)) { - TAG_LOGD(AAFwkTag::CONTEXT, "the second parameter is invalid."); + TAG_LOGD(AAFwkTag::CONTEXT, "invalid second params"); ThrowInvalidParamError(env, "Parse param accountId failed, accountId must be number."); return CreateJsUndefined(env); } unwrapArgc++; AAFwk::StartOptions startOptions; if (info.argc > ARGC_TWO && CheckTypeForNapiValue(env, info.argv[INDEX_TWO], napi_object)) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityWithAccount start options is used."); + TAG_LOGD(AAFwkTag::CONTEXT, "start options is used"); AppExecFwk::UnwrapStartOptions(env, info.argv[INDEX_TWO], startOptions); unwrapArgc++; } @@ -969,7 +968,7 @@ bool JsAbilityContext::CheckStartAbilityByCallParams(napi_env env, NapiCallbackI if (!CheckTypeForNapiValue(env, info.argv[INDEX_ZERO], napi_object) || !AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to parse want!"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to parse want"); ThrowInvalidParamError(env, "Parse param want failed, want must be Want."); return false; } @@ -982,12 +981,12 @@ bool JsAbilityContext::CheckStartAbilityByCallParams(napi_env env, NapiCallbackI bool paramOneIsNumber = CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_number); bool paramOneIsFunction = CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_function); if (!paramOneIsNumber && !paramOneIsFunction) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed, input param type invalid"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid input params"); ThrowInvalidParamError(env, "Parse second param failed, second param must be callback or number."); return false; } if (paramOneIsNumber && !ConvertFromJsValue(env, info.argv[INDEX_ONE], userId)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to parse accountId!"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to parse accountId"); ThrowInvalidParamError(env, "Parse param accountId failed, accountId must be number."); return false; } @@ -1026,35 +1025,35 @@ napi_value JsAbilityContext::OnStartAbilityByCall(napi_env env, NapiCallbackInfo napi_value retsult = nullptr; auto context = context_.lock(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnStartAbilityByCall context is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); return CreateJsUndefined(env); } auto ret = context->StartAbilityByCall(want, callerCallBack, userId); if (ret != 0) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnStartAbilityByCall StartAbility is failed"); + TAG_LOGE(AAFwkTag::CONTEXT, "startAbility failed"); ThrowErrorByNativeErr(env, ret); return CreateJsUndefined(env); } if (calls->remoteCallee == nullptr) { - TAG_LOGI(AAFwkTag::CONTEXT, "OnStartAbilityByCall async wait execute"); + TAG_LOGI(AAFwkTag::CONTEXT, "async wait execute"); NapiAsyncTask::ScheduleHighQos("JsAbilityContext::OnStartAbilityByCall", env, CreateAsyncTaskWithLastParam(env, lastParam, std::move(callExecute), std::move(callComplete), &retsult)); } else { - TAG_LOGI(AAFwkTag::CONTEXT, "OnStartAbilityByCall promiss return result execute"); + TAG_LOGI(AAFwkTag::CONTEXT, "promiss return result execute"); NapiAsyncTask::ScheduleHighQos("JsAbilityContext::OnStartAbilityByCall", env, CreateAsyncTaskWithLastParam(env, lastParam, nullptr, std::move(callComplete), &retsult)); } - TAG_LOGD(AAFwkTag::CONTEXT, "JsAbilityContext, called end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); return retsult; } napi_value JsAbilityContext::OnStartAbilityForResult(napi_env env, NapiCallbackInfo& info) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityForResult is called"); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (info.argc == ARGC_ZERO) { ThrowTooFewParametersError(env); @@ -1063,7 +1062,7 @@ napi_value JsAbilityContext::OnStartAbilityForResult(napi_env env, NapiCallbackI AAFwk::Want want; if (!AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to parse want!"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to parse want"); ThrowInvalidParamError(env, "Parse param want failed, want must be Want."); return CreateJsUndefined(env); } @@ -1071,7 +1070,7 @@ napi_value JsAbilityContext::OnStartAbilityForResult(napi_env env, NapiCallbackI decltype(info.argc) unwrapArgc = ARGC_ONE; AAFwk::StartOptions startOptions; if (info.argc > ARGC_ONE && CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_object)) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityForResult begin options is used."); + TAG_LOGD(AAFwkTag::CONTEXT, "start, options is used"); AppExecFwk::UnwrapStartOptions(env, info.argv[INDEX_ONE], startOptions); unwrapArgc++; } @@ -1092,7 +1091,7 @@ napi_value JsAbilityContext::OnStartAbilityForResult(napi_env env, NapiCallbackI RuntimeTask task = [env, asyncTask, element = want.GetElement(), flags = want.GetFlags(), startTime, &observer = freeInstallObserver_] (int resultCode, const AAFwk::Want& want, bool isInner) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityForResult async callback is begin"); + TAG_LOGD(AAFwkTag::CONTEXT, "start async callback"); HandleScope handleScope(env); std::string bundleName = element.GetBundleName(); std::string abilityName = element.GetAbilityName(); @@ -1122,27 +1121,27 @@ napi_value JsAbilityContext::OnStartAbilityForResult(napi_env env, NapiCallbackI (unwrapArgc == ARGC_ONE) ? context->StartAbilityForResult(want, curRequestCode_, std::move(task)) : context->StartAbilityForResult(want, startOptions, curRequestCode_, std::move(task)); } - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityForResult is called end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); return result; } napi_value JsAbilityContext::OnStartAbilityForResultWithAccount(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "StartAbilityForResultWithAccount"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); auto selfToken = IPCSkeleton::GetSelfTokenID(); if (!Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(selfToken)) { - TAG_LOGE(AAFwkTag::CONTEXT, "This application is not system-app, can not use system-api"); + TAG_LOGE(AAFwkTag::CONTEXT, "non system app forbidden to call"); ThrowError(env, AbilityErrorCode::ERROR_CODE_NOT_SYSTEM_APP); return CreateJsUndefined(env); } if (info.argc < ARGC_TWO) { - TAG_LOGE(AAFwkTag::CONTEXT, "Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } AAFwk::Want want; if (!AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to parse want!"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to parse want"); ThrowInvalidParamError(env, "Parse param want failed, want must be Want."); return CreateJsUndefined(env); } @@ -1150,14 +1149,14 @@ napi_value JsAbilityContext::OnStartAbilityForResultWithAccount(napi_env env, Na decltype(info.argc) unwrapArgc = ARGC_ONE; int32_t accountId = 0; if (!OHOS::AppExecFwk::UnwrapInt32FromJS2(env, info.argv[INDEX_ONE], accountId)) { - TAG_LOGE(AAFwkTag::CONTEXT, "the second parameter is invalid."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid second params"); ThrowInvalidParamError(env, "Parse param accountId failed, accountId must be number."); return CreateJsUndefined(env); } unwrapArgc++; AAFwk::StartOptions startOptions; if (info.argc > ARGC_TWO && CheckTypeForNapiValue(env, info.argv[INDEX_TWO], napi_object)) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityForResultWithAccount start options is used."); + TAG_LOGD(AAFwkTag::CONTEXT, "start options is used"); AppExecFwk::UnwrapStartOptions(env, info.argv[INDEX_TWO], startOptions); unwrapArgc++; } @@ -1177,7 +1176,7 @@ napi_value JsAbilityContext::OnStartAbilityForResultWithAccount(napi_env env, Na RuntimeTask task = [env, asyncTask, element = want.GetElement(), flags = want.GetFlags(), startTime, &observer = freeInstallObserver_] (int resultCode, const AAFwk::Want& want, bool isInner) { - TAG_LOGD(AAFwkTag::CONTEXT, "async callback is called"); + TAG_LOGD(AAFwkTag::CONTEXT, "start async callback"); std::string bundleName = element.GetBundleName(); std::string abilityName = element.GetAbilityName(); HandleScope handleScope(env); @@ -1196,7 +1195,7 @@ napi_value JsAbilityContext::OnStartAbilityForResultWithAccount(napi_env env, Na isInner ? asyncTask->Reject(env, CreateJsErrorByNativeErr(env, resultCode)) : asyncTask->Resolve(env, abilityResult); } - TAG_LOGD(AAFwkTag::CONTEXT, "async callback is called end"); + TAG_LOGD(AAFwkTag::CONTEXT, "finish async callback"); }; auto context = context_.lock(); if (context == nullptr) { @@ -1208,13 +1207,13 @@ napi_value JsAbilityContext::OnStartAbilityForResultWithAccount(napi_env env, Na want, accountId, curRequestCode_, std::move(task)) : context->StartAbilityForResultWithAccount( want, accountId, startOptions, curRequestCode_, std::move(task)); } - TAG_LOGD(AAFwkTag::CONTEXT, "OnStartAbilityForResultWithAccount is called end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); return result; } napi_value JsAbilityContext::OnStartExtensionAbility(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "StartExtensionAbility"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); if (info.argc < ARGC_ONE) { ThrowTooFewParametersError(env); return CreateJsUndefined(env); @@ -1222,7 +1221,7 @@ napi_value JsAbilityContext::OnStartExtensionAbility(napi_env env, NapiCallbackI AAFwk::Want want; if (!AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to parse want!"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to parse want"); ThrowInvalidParamError(env, "Parse param want failed, want must be Want."); return CreateJsUndefined(env); } @@ -1252,9 +1251,9 @@ napi_value JsAbilityContext::OnStartExtensionAbility(napi_env env, NapiCallbackI napi_value JsAbilityContext::OnStartExtensionAbilityWithAccount(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "StartExtensionAbilityWithAccount"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); if (info.argc < ARGC_TWO) { - TAG_LOGE(AAFwkTag::CONTEXT, "param is too few."); + TAG_LOGE(AAFwkTag::CONTEXT, "param is too few"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -1292,9 +1291,9 @@ napi_value JsAbilityContext::OnStartExtensionAbilityWithAccount(napi_env env, Na napi_value JsAbilityContext::OnStopExtensionAbility(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "StopExtensionAbility"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); if (info.argc < ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "param is too few for stop extension ability."); + TAG_LOGE(AAFwkTag::CONTEXT, "param is too few for stop extension ability"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -1309,7 +1308,7 @@ napi_value JsAbilityContext::OnStopExtensionAbility(napi_env env, NapiCallbackIn [weak = context_, want](napi_env env, NapiAsyncTask& task, int32_t status) { auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); return; } @@ -1330,9 +1329,9 @@ napi_value JsAbilityContext::OnStopExtensionAbility(napi_env env, NapiCallbackIn napi_value JsAbilityContext::OnStopExtensionAbilityWithAccount(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "StartExtensionAbilityWithAccount"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); if (info.argc < ARGC_TWO) { - TAG_LOGE(AAFwkTag::CONTEXT, "param is too few for stop extension ability with account."); + TAG_LOGE(AAFwkTag::CONTEXT, "param is too few for stop extension ability with account"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -1350,7 +1349,7 @@ napi_value JsAbilityContext::OnStopExtensionAbilityWithAccount(napi_env env, Nap [weak = context_, want, accountId](napi_env env, NapiAsyncTask& task, int32_t status) { auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); return; } @@ -1371,10 +1370,10 @@ napi_value JsAbilityContext::OnStopExtensionAbilityWithAccount(napi_env env, Nap napi_value JsAbilityContext::OnTerminateSelfWithResult(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateSelfWithResult"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); if (info.argc == ARGC_ZERO) { - TAG_LOGE(AAFwkTag::CONTEXT, "Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -1394,10 +1393,10 @@ napi_value JsAbilityContext::OnTerminateSelfWithResult(napi_env env, NapiCallbac NapiAsyncTask::CompleteCallback complete = [weak = context_, want, resultCode](napi_env env, NapiAsyncTask& task, int32_t status) { - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateSelfWithResult async"); + TAG_LOGI(AAFwkTag::CONTEXT, "async terminateSelfWithResult "); auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); return; } @@ -1431,7 +1430,7 @@ napi_value JsAbilityContext::OnConnectAbility(napi_env env, NapiCallbackInfo& in // unwrap want AAFwk::Want want; OHOS::AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want); - TAG_LOGD(AAFwkTag::CONTEXT, "ConnectAbility, callee:%{public}s.%{public}s", + TAG_LOGD(AAFwkTag::CONTEXT, "callee:%{public}s.%{public}s", want.GetBundle().c_str(), want.GetElement().GetAbilityName().c_str()); @@ -1443,12 +1442,12 @@ napi_value JsAbilityContext::OnConnectAbility(napi_env env, NapiCallbackInfo& in [weak = context_, want, connection, connectId](napi_env env, NapiAsyncTask& task, int32_t status) { auto context = weak.lock(); if (!context) { - TAG_LOGE(AAFwkTag::CONTEXT, "Connect ability failed, context is released."); + TAG_LOGE(AAFwkTag::CONTEXT, "connect ability failed, context is released"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); RemoveConnection(connectId); return; } - TAG_LOGD(AAFwkTag::CONTEXT, "ConnectAbility connection:%{public}d", static_cast(connectId)); + TAG_LOGD(AAFwkTag::CONTEXT, "connectAbility: %{public}d", static_cast(connectId)); auto innerErrorCode = context->ConnectAbility(want, connection); int32_t errcode = static_cast(AbilityRuntime::GetJsErrorCodeByNativeError(innerErrorCode)); if (errcode) { @@ -1467,25 +1466,25 @@ napi_value JsAbilityContext::OnConnectAbilityWithAccount(napi_env env, NapiCallb { // only support three params if (info.argc < ARGC_THREE) { - TAG_LOGE(AAFwkTag::CONTEXT, "Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } auto selfToken = IPCSkeleton::GetSelfTokenID(); if (!Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(selfToken)) { - TAG_LOGE(AAFwkTag::CONTEXT, "This application is not system-app, can not use system-api"); + TAG_LOGE(AAFwkTag::CONTEXT, "non system app forbidden to call"); ThrowError(env, AbilityErrorCode::ERROR_CODE_NOT_SYSTEM_APP); return CreateJsUndefined(env); } // unwrap want AAFwk::Want want; OHOS::AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want); - TAG_LOGI(AAFwkTag::CONTEXT, "ConnectAbilityWithAccount, bundlename:%{public}s abilityname:%{public}s", + TAG_LOGI(AAFwkTag::CONTEXT, "bundlename:%{public}s abilityname:%{public}s", want.GetBundle().c_str(), want.GetElement().GetAbilityName().c_str()); int32_t accountId = 0; if (!OHOS::AppExecFwk::UnwrapInt32FromJS2(env, info.argv[INDEX_ONE], accountId)) { - TAG_LOGE(AAFwkTag::CONTEXT, "the second parameter is invalid."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid second params"); ThrowInvalidParamError(env, "Parse param accountId failed, accountId must be number."); return CreateJsUndefined(env); } @@ -1524,7 +1523,7 @@ napi_value JsAbilityContext::OnDisconnectAbility(napi_env env, NapiCallbackInfo& { std::lock_guard lock(gConnectsLock_); if (info.argc < ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } @@ -1536,7 +1535,7 @@ napi_value JsAbilityContext::OnDisconnectAbility(napi_env env, NapiCallbackInfo& sptr connection = nullptr; int32_t accountId = -1; napi_get_value_int64(env, info.argv[INDEX_ZERO], &connectId); - TAG_LOGI(AAFwkTag::CONTEXT, "DisconnectAbility, connection:%{public}d.", static_cast(connectId)); + TAG_LOGI(AAFwkTag::CONTEXT, "connection:%{public}d", static_cast(connectId)); auto item = std::find_if(g_connects.begin(), g_connects.end(), [&connectId](const auto &obj) { @@ -1548,7 +1547,7 @@ napi_value JsAbilityContext::OnDisconnectAbility(napi_env env, NapiCallbackInfo& connection = item->second; accountId = item->first.accountId; } else { - TAG_LOGI(AAFwkTag::CONTEXT, "not find conn exist."); + TAG_LOGI(AAFwkTag::CONTEXT, "not find conn exist"); } // begin disconnect NapiAsyncTask::CompleteCallback complete = @@ -1556,12 +1555,12 @@ napi_value JsAbilityContext::OnDisconnectAbility(napi_env env, NapiCallbackInfo& napi_env env, NapiAsyncTask& task, int32_t status) { auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "OnDisconnectAbility context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); return; } if (connection == nullptr) { - TAG_LOGW(AAFwkTag::CONTEXT, "connection nullptr"); + TAG_LOGW(AAFwkTag::CONTEXT, "null connection"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INNER)); return; } @@ -1579,7 +1578,7 @@ napi_value JsAbilityContext::OnDisconnectAbility(napi_env env, NapiCallbackInfo& napi_value JsAbilityContext::OnTerminateSelf(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateSelf"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); auto abilityContext = context_.lock(); if (abilityContext != nullptr) { abilityContext->SetTerminating(true); @@ -1587,10 +1586,10 @@ napi_value JsAbilityContext::OnTerminateSelf(napi_env env, NapiCallbackInfo& inf NapiAsyncTask::CompleteCallback complete = [weak = context_](napi_env env, NapiAsyncTask& task, int32_t status) { - TAG_LOGI(AAFwkTag::CONTEXT, "TerminateSelf async"); + TAG_LOGI(AAFwkTag::CONTEXT, "async terminate self"); auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); return; } @@ -1609,22 +1608,22 @@ napi_value JsAbilityContext::OnTerminateSelf(napi_env env, NapiCallbackInfo& inf napi_value JsAbilityContext::OnRestoreWindowStage(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "RestoreWindowStage, info.argc = %{public}d", static_cast(info.argc)); + TAG_LOGI(AAFwkTag::CONTEXT, "called, info.argc = %{public}d", static_cast(info.argc)); if (info.argc < ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnRestoreWindowStage need one parameters"); + TAG_LOGE(AAFwkTag::CONTEXT, "need one parames"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } auto context = context_.lock(); if (!context) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnRestoreWindowStage context is released"); + TAG_LOGE(AAFwkTag::CONTEXT, "released context"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); return CreateJsUndefined(env); } auto errcode = context->RestoreWindowStage(env, info.argv[INDEX_ZERO]); if (errcode != 0) { ThrowError(env, AbilityErrorCode::ERROR_CODE_INNER); - return CreateJsError(env, errcode, "RestoreWindowStage failed."); + return CreateJsError(env, errcode, "restoreWindowStage failed"); } return CreateJsUndefined(env); } @@ -1632,14 +1631,14 @@ napi_value JsAbilityContext::OnRestoreWindowStage(napi_env env, NapiCallbackInfo napi_value JsAbilityContext::OnRequestDialogService(napi_env env, NapiCallbackInfo& info) { if (info.argc < ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } AAFwk::Want want; AppExecFwk::UnwrapWant(env, info.argv[INDEX_ZERO], want); - TAG_LOGI(AAFwkTag::CONTEXT, "RequestDialogService, target:%{public}s.%{public}s.", want.GetBundle().c_str(), + TAG_LOGD(AAFwkTag::CONTEXT, "target:%{public}s.%{public}s", want.GetBundle().c_str(), want.GetElement().GetAbilityName().c_str()); napi_value lastParam = (info.argc > ARGC_ONE) ? info.argv[INDEX_ONE] : nullptr; @@ -1656,11 +1655,11 @@ napi_value JsAbilityContext::OnRequestDialogService(napi_env env, NapiCallbackIn } else { asyncTask->Resolve(env, requestResult); } - TAG_LOGD(AAFwkTag::CONTEXT, "OnRequestDialogService async callback is called end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end async callback"); }; auto context = context_.lock(); if (context == nullptr) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released, can not requestDialogService"); + TAG_LOGW(AAFwkTag::CONTEXT, "null context"); asyncTask->Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); } else { auto errCode = context->RequestDialogService(env, want, std::move(task)); @@ -1668,16 +1667,16 @@ napi_value JsAbilityContext::OnRequestDialogService(napi_env env, NapiCallbackIn asyncTask->Reject(env, CreateJsError(env, GetJsErrorCodeByNativeError(errCode))); } } - TAG_LOGD(AAFwkTag::CONTEXT, "OnRequestDialogService is called end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); return result; } napi_value JsAbilityContext::OnIsTerminating(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "IsTerminating"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); auto context = context_.lock(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnIsTerminating context is nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); return CreateJsUndefined(env); } @@ -1691,7 +1690,7 @@ napi_value JsAbilityContext::OnReportDrawnCompleted(napi_env env, NapiCallbackIn NapiAsyncTask::ExecuteCallback execute = [weak = context_, innerErrorCode]() { auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); *innerErrorCode = static_cast(AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); return; } @@ -1717,7 +1716,7 @@ napi_value JsAbilityContext::WrapRequestDialogResult(napi_env env, napi_value object = nullptr; napi_create_object(env, &object); if (!CheckTypeForNapiValue(env, object, napi_object)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get object"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to get object"); return nullptr; } @@ -1733,7 +1732,7 @@ void JsAbilityContext::InheritWindowMode(AAFwk::Want &want) // only split mode need inherit auto context = context_.lock(); if (!context) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return; } auto windowMode = context->GetCurrentWindowMode(); @@ -1751,20 +1750,20 @@ void JsAbilityContext::ConfigurationUpdated(napi_env env, std::shared_ptrGetNapiValue(); if (!CheckTypeForNapiValue(env, object, napi_object)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get object"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to get object"); return; } napi_value method = nullptr; napi_get_named_property(env, object, "onUpdateConfiguration", &method); if (method == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get onUpdateConfiguration from object"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to get method from object"); return; } @@ -1776,24 +1775,24 @@ void JsAbilityContext::AddFreeInstallObserver(napi_env env, const AAFwk::Want &w napi_value *result, bool isAbilityResult, bool isOpenLink) { // adapter free install async return install and start result - TAG_LOGD(AAFwkTag::CONTEXT, "ConvertWindowSize begin."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); int ret = 0; if (freeInstallObserver_ == nullptr) { freeInstallObserver_ = new JsFreeInstallObserver(env); auto context = context_.lock(); if (!context) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); return; } ret = context->AddFreeInstallObserver(freeInstallObserver_); } if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "AddFreeInstallObserver error."); + TAG_LOGE(AAFwkTag::CONTEXT, "addFreeInstallObserver error"); } std::string startTime = want.GetStringParam(Want::PARAM_RESV_START_TIME); if (!isOpenLink) { - TAG_LOGI(AAFwkTag::CONTEXT, "AddJsObserverObject"); + TAG_LOGI(AAFwkTag::CONTEXT, "addJsObserver"); std::string bundleName = want.GetElement().GetBundleName(); std::string abilityName = want.GetElement().GetAbilityName(); freeInstallObserver_->AddJsObserverObject( @@ -1895,19 +1894,19 @@ JSAbilityConnection::~JSAbilityConnection() void JSAbilityConnection::ReleaseNativeReference(NativeReference* ref) { if (ref == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: ref == nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null ref"); return; } uv_loop_t *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: failed to get uv loop."); + TAG_LOGE(AAFwkTag::CONTEXT, "null uv loop"); delete ref; return; } uv_work_t *work = new (std::nothrow) uv_work_t; if (work == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: failed to create work."); + TAG_LOGE(AAFwkTag::CONTEXT, "null work"); delete ref; return; } @@ -1915,11 +1914,11 @@ void JSAbilityConnection::ReleaseNativeReference(NativeReference* ref) int ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, [](uv_work_t *work, int status) { if (work == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: work is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null work"); return; } if (work->data == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: data is nullptr."); + TAG_LOGE(AAFwkTag::CONTEXT, "null data"); delete work; work = nullptr; return; @@ -1947,13 +1946,13 @@ void JSAbilityConnection::SetConnectionId(int64_t id) void JSAbilityConnection::OnAbilityConnectDone(const AppExecFwk::ElementName &element, const sptr &remoteObject, int resultCode) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnAbilityConnectDone, resultCode:%{public}d", resultCode); + TAG_LOGD(AAFwkTag::CONTEXT, "resultCode:%{public}d", resultCode); wptr connection = this; std::unique_ptr complete = std::make_unique ([connection, element, remoteObject, resultCode](napi_env env, NapiAsyncTask &task, int32_t status) { sptr connectionSptr = connection.promote(); if (!connectionSptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "connectionSptr nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null connectionSptr"); return; } connectionSptr->HandleOnAbilityConnectDone(element, remoteObject, resultCode); @@ -1968,20 +1967,20 @@ void JSAbilityConnection::OnAbilityConnectDone(const AppExecFwk::ElementName &el void JSAbilityConnection::HandleOnAbilityConnectDone(const AppExecFwk::ElementName &element, const sptr &remoteObject, int resultCode) { - TAG_LOGD(AAFwkTag::CONTEXT, "HandleOnAbilityConnectDone, resultCode:%{public}d", resultCode); + TAG_LOGD(AAFwkTag::CONTEXT, "resultCode:%{public}d", resultCode); if (jsConnectionObject_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "jsConnectionObject_ nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null jsConnectionObject_"); return; } napi_value obj = jsConnectionObject_->GetNapiValue(); if (!CheckTypeForNapiValue(env_, obj, napi_object)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get object"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to get object"); return; } napi_value methodOnConnect = nullptr; napi_get_named_property(env_, obj, "onConnect", &methodOnConnect); if (methodOnConnect == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get onConnect from object"); + TAG_LOGE(AAFwkTag::CONTEXT, "null methodOnConnect"); return; } @@ -1989,18 +1988,18 @@ void JSAbilityConnection::HandleOnAbilityConnectDone(const AppExecFwk::ElementNa napi_value napiRemoteObject = NAPI_ohos_rpc_CreateJsRemoteObject(env_, remoteObject); napi_value argv[] = { ConvertElement(element), napiRemoteObject }; napi_call_function(env_, obj, methodOnConnect, ARGC_TWO, argv, nullptr); - TAG_LOGD(AAFwkTag::CONTEXT, "OnAbilityConnectDone end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); } void JSAbilityConnection::OnAbilityDisconnectDone(const AppExecFwk::ElementName &element, int resultCode) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnAbilityDisconnectDone, resultCode:%{public}d", resultCode); + TAG_LOGD(AAFwkTag::CONTEXT, "resultCode:%{public}d", resultCode); wptr connection = this; std::unique_ptr complete = std::make_unique ([connection, element, resultCode](napi_env env, NapiAsyncTask &task, int32_t status) { sptr connectionSptr = connection.promote(); if (!connectionSptr) { - TAG_LOGI(AAFwkTag::CONTEXT, "connectionSptr nullptr"); + TAG_LOGI(AAFwkTag::CONTEXT, "null connectionSptr"); return; } connectionSptr->HandleOnAbilityDisconnectDone(element, resultCode); @@ -2017,25 +2016,25 @@ void JSAbilityConnection::HandleOnAbilityDisconnectDone(const AppExecFwk::Elemen std::lock_guard lock(gConnectsLock_); TAG_LOGD(AAFwkTag::CONTEXT, "resultCode:%{public}d", resultCode); if (jsConnectionObject_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "jsConnectionObject_ nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null jsConnectionObject_"); return; } napi_value obj = jsConnectionObject_->GetNapiValue(); if (!CheckTypeForNapiValue(env_, obj, napi_object)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Wrong to get object"); + TAG_LOGE(AAFwkTag::CONTEXT, "wrong to get object"); return; } napi_value method = nullptr; napi_get_named_property(env_, obj, "onDisconnect", &method); if (method == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Wrong to get onDisconnect from object"); + TAG_LOGE(AAFwkTag::CONTEXT, "null method"); return; } // release connect - TAG_LOGD(AAFwkTag::CONTEXT, "OnAbilityDisconnectDone g_connects.size:%{public}zu", g_connects.size()); + TAG_LOGD(AAFwkTag::CONTEXT, "start, g_connects.size:%{public}zu", g_connects.size()); std::string bundleName = element.GetBundleName(); std::string abilityName = element.GetAbilityName(); auto item = std::find_if(g_connects.begin(), g_connects.end(), @@ -2048,63 +2047,63 @@ void JSAbilityConnection::HandleOnAbilityDisconnectDone(const AppExecFwk::Elemen if (item != g_connects.end()) { // match bundlename && abilityname g_connects.erase(item); - TAG_LOGD(AAFwkTag::CONTEXT, "OnAbilityDisconnectDone erase g_connects.size:%{public}zu", g_connects.size()); + TAG_LOGD(AAFwkTag::CONTEXT, "end release connect, erase g_connects.size:%{public}zu", g_connects.size()); } napi_value argv[] = { ConvertElement(element) }; - TAG_LOGD(AAFwkTag::CONTEXT, "OnAbilityDisconnectDone CallFunction success"); + TAG_LOGD(AAFwkTag::CONTEXT, "success"); napi_call_function(env_, obj, method, ARGC_ONE, argv, nullptr); } void JSAbilityConnection::CallJsFailed(int32_t errorCode) { - TAG_LOGI(AAFwkTag::CONTEXT, "CallJsFailed"); + TAG_LOGI(AAFwkTag::CONTEXT, "called"); if (jsConnectionObject_ == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "jsConnectionObject_ nullptr"); + TAG_LOGE(AAFwkTag::CONTEXT, "null jsConnectionObject_"); return; } napi_value obj = jsConnectionObject_->GetNapiValue(); if (!CheckTypeForNapiValue(env_, obj, napi_object)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get object"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to get object"); return; } napi_value method = nullptr; napi_get_named_property(env_, obj, "onFailed", &method); if (method == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get onFailed from object"); + TAG_LOGE(AAFwkTag::CONTEXT, "null method"); return; } napi_value argv[] = {CreateJsValue(env_, errorCode)}; napi_call_function(env_, obj, method, ARGC_ONE, argv, nullptr); - TAG_LOGD(AAFwkTag::CONTEXT, "CallJsFailed end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); } napi_value JSAbilityConnection::CallObjectMethod(const char* name, napi_value const *argv, size_t argc) { TAG_LOGD(AAFwkTag::CONTEXT, "name:%{public}s", name); if (!jsConnectionObject_) { - TAG_LOGW(AAFwkTag::CONTEXT, "Not found jsConnectionObject_"); + TAG_LOGW(AAFwkTag::CONTEXT, "not found jsConnectionObject_"); return nullptr; } HandleScope handleScope(env_); napi_value obj = jsConnectionObject_->GetNapiValue(); if (!CheckTypeForNapiValue(env_, obj, napi_object)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get jsConnectionObject_ object"); + TAG_LOGE(AAFwkTag::CONTEXT, "type error: connection napi value"); return nullptr; } napi_value method = nullptr; napi_get_named_property(env_, obj, name, &method); if (!CheckTypeForNapiValue(env_, method, napi_function)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get '%{public}s' from jsConnectionObject_ object", name); + TAG_LOGE(AAFwkTag::CONTEXT, "type error, method: '%{public}s'", name); return nullptr; } napi_value result = nullptr; napi_call_function(env_, obj, method, argc, argv, &result); - TAG_LOGD(AAFwkTag::CONTEXT, "CallFunction(%{public}s) ok", name); + TAG_LOGD(AAFwkTag::CONTEXT, "callFunction(%{public}s) ok", name); return result; } @@ -2132,22 +2131,22 @@ napi_value JsAbilityContext::SetMissionContinueState(napi_env env, napi_callback napi_value JsAbilityContext::OnSetMissionContinueState(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "OnSetMissionContinueState, info.argc = %{public}d", static_cast(info.argc)); + TAG_LOGI(AAFwkTag::CONTEXT, "info.argc: %{public}d", static_cast(info.argc)); if (info.argc < ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnSetMissionContinueState, Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } AAFwk::ContinueState state; if (!ConvertFromJsValue(env, info.argv[INDEX_ZERO], state)) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnSetMissionContinueState, parse state failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "parse state failed"); ThrowInvalidParamError(env, "Parse param state failed, state must be State."); return CreateJsUndefined(env); } if (state <= AAFwk::ContinueState::CONTINUESTATE_UNKNOWN || state >= AAFwk::ContinueState::CONTINUESTATE_MAX) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnSetMissionContinueState, invalid state param, state = %{public}d.", state); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params, state: %{public}d", state); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -2161,7 +2160,7 @@ napi_value JsAbilityContext::OnSetMissionContinueState(napi_env env, NapiCallbac NapiAsyncTask::ExecuteCallback execute = [weak = context_, state, innerErrorCode]() { auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); *innerErrorCode = static_cast(AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); return; } @@ -2191,7 +2190,7 @@ napi_value JsAbilityContext::SyncSetMissionContinueState(napi_env env, NapiCallb if (context) { *innerErrorCode = context->SetMissionContinueState(state); } else { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); *innerErrorCode = static_cast(AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); } NapiAsyncTask::CompleteCallback complete = [innerErrorCode](napi_env env, NapiAsyncTask& task, int32_t status) { @@ -2221,16 +2220,16 @@ napi_value JsAbilityContext::SetMissionIcon(napi_env env, napi_callback_info inf napi_value JsAbilityContext::OnSetMissionLabel(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "SetMissionLabel, info.argc = %{public}d", static_cast(info.argc)); + TAG_LOGI(AAFwkTag::CONTEXT, "info.argc: %{public}d", static_cast(info.argc)); if (info.argc < ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnSetMissionLabel, Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } std::string label; if (!ConvertFromJsValue(env, info.argv[INDEX_ZERO], label)) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnSetMissionLabel, parse label failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "parse label failed"); ThrowInvalidParamError(env, "Parse param label failed, label must be string."); return CreateJsUndefined(env); } @@ -2261,16 +2260,16 @@ napi_value JsAbilityContext::OnSetMissionLabel(napi_env env, NapiCallbackInfo& i napi_value JsAbilityContext::OnSetMissionIcon(napi_env env, NapiCallbackInfo& info) { - TAG_LOGI(AAFwkTag::CONTEXT, "SetMissionIcon, info.argc = %{public}d", static_cast(info.argc)); + TAG_LOGI(AAFwkTag::CONTEXT, "info.argc: %{public}d", static_cast(info.argc)); if (info.argc < ARGC_ONE) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnSetMissionIcon, Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } auto icon = OHOS::Media::PixelMapNapi::GetPixelMap(env, info.argv[INDEX_ZERO]); if (!icon) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnSetMissionIcon, parse icon failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "parse icon failed"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM); return CreateJsUndefined(env); } @@ -2304,21 +2303,21 @@ napi_value JsAbilityContext::OnStartAbilityByType(napi_env env, NapiCallbackInfo { TAG_LOGI(AAFwkTag::CONTEXT, "call"); if (info.argc < ARGC_THREE) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnStartAbilityByType, Not enough params"); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } std::string type; if (!ConvertFromJsValue(env, info.argv[INDEX_ZERO], type)) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnStartAbilityByType, parse type failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "parse type failed"); ThrowInvalidParamError(env, "Parse param type failed, type must be string."); return CreateJsUndefined(env); } AAFwk::WantParams wantParam; if (!AppExecFwk::UnwrapWantParams(env, info.argv[INDEX_ONE], wantParam)) { - TAG_LOGE(AAFwkTag::CONTEXT, "OnStartAbilityByType, parse wantParam failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "parse wantParam failed"); ThrowInvalidParamError(env, "Parse param want failed, want must be Want."); return CreateJsUndefined(env); } @@ -2329,7 +2328,7 @@ napi_value JsAbilityContext::OnStartAbilityByType(napi_env env, NapiCallbackInfo [weak = context_, type, wantParam, callback](napi_env env, NapiAsyncTask& task, int32_t status) mutable { auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "OnStartAbilityByType context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "complete, context is released"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); return; } @@ -2356,7 +2355,7 @@ napi_value JsAbilityContext::OnRequestModalUIExtension(napi_env env, NapiCallbac } AAFwk::Want want; if (!AppExecFwk::UnwrapWant(env, info.argv[0], want)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to parse want!"); + TAG_LOGE(AAFwkTag::CONTEXT, "failed to parse want"); ThrowInvalidParamError(env, "Parse param want failed, want must be Want."); return CreateJsUndefined(env); } @@ -2364,7 +2363,7 @@ napi_value JsAbilityContext::OnRequestModalUIExtension(napi_env env, NapiCallbac NapiAsyncTask::ExecuteCallback execute = [abilityContext = context_, want, innerErrCode]() { auto context = abilityContext.lock(); if (!context) { - TAG_LOGE(AAFwkTag::APPKIT, "context is released"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); *innerErrCode = static_cast(AbilityErrorCode::ERROR_CODE_INNER); return; } @@ -2374,7 +2373,7 @@ napi_value JsAbilityContext::OnRequestModalUIExtension(napi_env env, NapiCallbac if (*innerErrCode == ERR_OK) { task.Resolve(env, CreateJsUndefined(env)); } else { - TAG_LOGE(AAFwkTag::APPKIT, "OnRequestModalUIExtension failed %{public}d", *innerErrCode); + TAG_LOGE(AAFwkTag::CONTEXT, "complete failed %{public}d", *innerErrCode); task.Reject(env, CreateJsErrorByNativeErr(env, *innerErrCode)); } }; @@ -2402,7 +2401,7 @@ napi_value JsAbilityContext::ChangeAbilityVisibility(napi_env env, NapiCallbackI [weak = context_, isShow](napi_env env, NapiAsyncTask& task, int32_t status) { auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "null context"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); return; } @@ -2426,7 +2425,7 @@ napi_value JsAbilityContext::OnOpenAtomicService(napi_env env, NapiCallbackInfo& std::string appId; if (!ConvertFromJsValue(env, info.argv[INDEX_ZERO], appId)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Fail to parse appId."); + TAG_LOGE(AAFwkTag::CONTEXT, "fail to parse appId"); ThrowInvalidParamError(env, "Parse param appId failed, appId must be string."); return CreateJsUndefined(env); } @@ -2434,16 +2433,16 @@ napi_value JsAbilityContext::OnOpenAtomicService(napi_env env, NapiCallbackInfo& Want want; AAFwk::StartOptions startOptions; if (info.argc > ARGC_ONE && CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_object)) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnOpenAtomicService atomic service options is used."); + TAG_LOGD(AAFwkTag::CONTEXT, "atomic service options is used"); if (!AppExecFwk::UnwrapStartOptionsAndWant(env, info.argv[INDEX_ONE], startOptions, want)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Fail to parse atomic service options."); + TAG_LOGE(AAFwkTag::CONTEXT, "invalid atomic service options"); ThrowInvalidParamError(env, "Parse param startOptions failed, startOptions must be StartOption."); return CreateJsUndefined(env); } } std::string bundleName = ATOMIC_SERVICE_PREFIX + appId; - TAG_LOGD(AAFwkTag::CONTEXT, "bundleName: %{public}s.", bundleName.c_str()); + TAG_LOGD(AAFwkTag::CONTEXT, "bundleName: %{public}s", bundleName.c_str()); want.SetBundle(bundleName); return OpenAtomicServiceInner(env, info, want, startOptions); } @@ -2460,9 +2459,9 @@ napi_value JsAbilityContext::OpenAtomicServiceInner(napi_env env, NapiCallbackIn AddFreeInstallObserver(env, want, nullptr, &result, true); RuntimeTask task = [env, element = want.GetElement(), startTime, &observer = freeInstallObserver_]( int resultCode, const AAFwk::Want& want, bool isInner) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnOpenAtomicService async callback is begin"); + TAG_LOGD(AAFwkTag::CONTEXT, "start async callback"); if (observer == nullptr) { - TAG_LOGW(AAFwkTag::CONTEXT, "observer is nullptr."); + TAG_LOGW(AAFwkTag::CONTEXT, "null observer"); return; } HandleScope handleScope(env); @@ -2479,7 +2478,7 @@ napi_value JsAbilityContext::OpenAtomicServiceInner(napi_env env, NapiCallbackIn }; auto context = context_.lock(); if (context == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGE(AAFwkTag::CONTEXT, "null context"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); return CreateJsUndefined(env); } else { @@ -2487,21 +2486,21 @@ napi_value JsAbilityContext::OpenAtomicServiceInner(napi_env env, NapiCallbackIn curRequestCode_ = (curRequestCode_ == INT_MAX) ? 0 : (curRequestCode_ + 1); context->OpenAtomicService(want, options, curRequestCode_, std::move(task)); } - TAG_LOGD(AAFwkTag::CONTEXT, "OnOpenAtomicService is called end"); + TAG_LOGD(AAFwkTag::CONTEXT, "end"); return result; } napi_value JsAbilityContext::OnMoveAbilityToBackground(napi_env env, NapiCallbackInfo& info) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnMoveAbilityToBackground"); + TAG_LOGD(AAFwkTag::CONTEXT, "start"); auto abilityContext = context_.lock(); NapiAsyncTask::CompleteCallback complete = [weak = context_](napi_env env, NapiAsyncTask& task, int32_t status) { - TAG_LOGD(AAFwkTag::CONTEXT, "OnMoveAbilityToBackground task"); + TAG_LOGD(AAFwkTag::CONTEXT, "start task"); auto context = weak.lock(); if (!context) { - TAG_LOGW(AAFwkTag::CONTEXT, "context is released"); + TAG_LOGW(AAFwkTag::CONTEXT, "released context"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); return; } @@ -2523,23 +2522,23 @@ napi_value JsAbilityContext::OnMoveAbilityToBackground(napi_env env, NapiCallbac napi_value JsAbilityContext::OnSetRestoreEnabled(napi_env env, NapiCallbackInfo& info) { - TAG_LOGD(AAFwkTag::CONTEXT, "Set if support restore."); + TAG_LOGD(AAFwkTag::CONTEXT, "called"); if (info.argc == ARGC_ZERO) { - TAG_LOGE(AAFwkTag::CONTEXT, "Not enough params."); + TAG_LOGE(AAFwkTag::CONTEXT, "not enough params"); ThrowTooFewParametersError(env); return CreateJsUndefined(env); } auto abilityContext = context_.lock(); if (abilityContext == nullptr) { - TAG_LOGW(AAFwkTag::CONTEXT, "Context has already released."); + TAG_LOGW(AAFwkTag::CONTEXT, "null abilityContext"); ThrowError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT); return CreateJsUndefined(env); } bool enabled = true; if (!ConvertFromJsValue(env, info.argv[INDEX_ZERO], enabled)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Parse param failed."); + TAG_LOGE(AAFwkTag::CONTEXT, "parse param failed"); ThrowInvalidParamError(env, "Parse param enabled failed."); return CreateJsUndefined(env); } diff --git a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp index ae31e3d570e..89f612c78e8 100644 --- a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp +++ b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_content_session.cpp @@ -1056,7 +1056,7 @@ void JsUIExtensionContentSession::AddFreeInstallObserver(napi_env env, freeInstallObserver_ = new JsFreeInstallObserver(env); auto context = context_.lock(); if (!context) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is nullptr."); + TAG_LOGE(AAFwkTag::UI_EXT, "null context"); return; } ret = AAFwk::AbilityManagerClient::GetInstance()->AddFreeInstallObserver(context->GetToken(), diff --git a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_context.cpp b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_context.cpp index 25a0b51deeb..2cbc432aa1a 100755 --- a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_context.cpp +++ b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension_context.cpp @@ -771,7 +771,7 @@ void JsUIExtensionContext::DoConnectUIServiceExtension(napi_env env, uint64_t connectId = connection->GetConnectionId(); auto context = weakContext.lock(); if (!context) { - TAG_LOGE(AAFwkTag::CONTEXT, "Connect ability failed, context is released."); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "connect ability failed, context is released"); uasyncTaskShared->Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_CONTEXT)); UIServiceConnection::RemoveUIServiceExtensionConnection(connectId); return; @@ -863,7 +863,7 @@ napi_value JsUIExtensionContext::OnReportDrawnCompleted(napi_env env, NapiCallba napi_value JsUIExtensionContext::OnOpenAtomicService(napi_env env, NapiCallbackInfo& info) { - TAG_LOGD(AAFwkTag::UI_EXT, "start"); + TAG_LOGD(AAFwkTag::UI_EXT, "called"); if (info.argc == ARGC_ZERO) { ThrowTooFewParametersError(env); return CreateJsUndefined(env); @@ -871,7 +871,7 @@ napi_value JsUIExtensionContext::OnOpenAtomicService(napi_env env, NapiCallbackI std::string appId; if (!ConvertFromJsValue(env, info.argv[INDEX_ZERO], appId)) { - TAG_LOGE(AAFwkTag::UI_EXT, "OnOpenAtomicService, parse appId failed"); + TAG_LOGE(AAFwkTag::UI_EXT, "parse appId failed"); ThrowInvalidParamError(env, "Parse param appId failed, appId must be string."); return CreateJsUndefined(env); } @@ -880,9 +880,9 @@ napi_value JsUIExtensionContext::OnOpenAtomicService(napi_env env, NapiCallbackI Want want; AAFwk::StartOptions startOptions; if (info.argc > ARGC_ONE && CheckTypeForNapiValue(env, info.argv[INDEX_ONE], napi_object)) { - TAG_LOGD(AAFwkTag::UI_EXT, "OnOpenAtomicService atomic service options is used"); + TAG_LOGD(AAFwkTag::UI_EXT, "atomic service options is used"); if (!AppExecFwk::UnwrapStartOptionsAndWant(env, info.argv[INDEX_ONE], startOptions, want)) { - TAG_LOGE(AAFwkTag::UI_EXT, "Fail to parse atomic service options"); + TAG_LOGE(AAFwkTag::UI_EXT, "invalid atomic service options"); ThrowInvalidParamError(env, "Parse param startOptions failed, startOptions must be StartOption."); return CreateJsUndefined(env); @@ -909,7 +909,7 @@ void JsUIExtensionContext::SetCallbackForTerminateWithResult(int32_t resultCode, } auto extensionContext = AbilityRuntime::Context::ConvertTo(context); if (!extensionContext) { - TAG_LOGE(AAFwkTag::UI_EXT, "extensionContext is nullptr"); + TAG_LOGE(AAFwkTag::UI_EXT, "null extensionContext"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM)); return; } @@ -918,7 +918,7 @@ void JsUIExtensionContext::SetCallbackForTerminateWithResult(int32_t resultCode, #ifdef SUPPORT_SCREEN sptr uiWindow = context->GetWindow(); if (!uiWindow) { - TAG_LOGE(AAFwkTag::UI_EXT, "uiWindow is nullptr"); + TAG_LOGE(AAFwkTag::UI_EXT, "null uiWindow"); task.Reject(env, CreateJsError(env, AbilityErrorCode::ERROR_CODE_INVALID_PARAM)); return; } @@ -948,9 +948,9 @@ napi_value JsUIExtensionContext::OpenAtomicServiceInner(napi_env env, NapiCallba AddFreeInstallObserver(env, want, nullptr, &result, true); RuntimeTask task = [env, element = want.GetElement(), startTime, &observer = freeInstallObserver_]( int resultCode, const AAFwk::Want& want, bool isInner) { - TAG_LOGD(AAFwkTag::UI_EXT, "OnOpenAtomicService async callback is begin"); + TAG_LOGD(AAFwkTag::UI_EXT, "start async callback"); if (observer == nullptr) { - TAG_LOGW(AAFwkTag::UI_EXT, "observer is nullptr"); + TAG_LOGW(AAFwkTag::UI_EXT, "null observer"); return; } HandleScope handleScope(env); @@ -986,24 +986,24 @@ void JsUIExtensionContext::AddFreeInstallObserver(napi_env env, const AAFwk::Wan napi_value *result, bool isAbilityResult, bool isOpenLink) { // adapter free install async return install and start result - TAG_LOGD(AAFwkTag::UI_EXT, "begin"); + TAG_LOGD(AAFwkTag::UI_EXT, "called"); int ret = 0; if (freeInstallObserver_ == nullptr) { freeInstallObserver_ = new JsFreeInstallObserver(env); auto context = context_.lock(); if (!context) { - TAG_LOGE(AAFwkTag::CONTEXT, "context is nullptr."); + TAG_LOGE(AAFwkTag::UI_EXT, "null context"); return; } ret = context->AddFreeInstallObserver(freeInstallObserver_); } if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::UI_EXT, "AddFreeInstallObserver error"); + TAG_LOGE(AAFwkTag::UI_EXT, "addFreeInstallObserver error"); } std::string startTime = want.GetStringParam(Want::PARAM_RESV_START_TIME); if (!isOpenLink) { - TAG_LOGI(AAFwkTag::UI_EXT, "AddJsObserverObject"); + TAG_LOGI(AAFwkTag::UI_EXT, "addJsObserver"); std::string bundleName = want.GetElement().GetBundleName(); std::string abilityName = want.GetElement().GetAbilityName(); freeInstallObserver_->AddJsObserverObject( @@ -1016,7 +1016,7 @@ void JsUIExtensionContext::AddFreeInstallObserver(napi_env env, const AAFwk::Wan napi_value JsUIExtensionContext::CreateJsUIExtensionContext(napi_env env, std::shared_ptr context) { - TAG_LOGD(AAFwkTag::UI_EXT, "begin"); + TAG_LOGD(AAFwkTag::UI_EXT, "called"); std::shared_ptr abilityInfo = nullptr; if (context) { abilityInfo = context->GetAbilityInfo(); @@ -1076,19 +1076,19 @@ JSUIExtensionConnection::~JSUIExtensionConnection() void JSUIExtensionConnection::ReleaseNativeReference(NativeReference* ref) { if (ref == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: ref == nullptr"); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "null ref"); return; } uv_loop_t *loop = nullptr; napi_get_uv_event_loop(env_, &loop); if (loop == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: failed to get uv loop."); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "null uv loop"); delete ref; return; } uv_work_t *work = new (std::nothrow) uv_work_t; if (work == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: failed to create work."); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "null work"); delete ref; return; } @@ -1096,11 +1096,11 @@ void JSUIExtensionConnection::ReleaseNativeReference(NativeReference* ref) int ret = uv_queue_work(loop, work, [](uv_work_t *work) {}, [](uv_work_t *work, int status) { if (work == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: work is nullptr."); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "null work"); return; } if (work->data == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "ReleaseNativeReference: data is nullptr."); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "null data"); delete work; work = nullptr; return; @@ -1263,28 +1263,28 @@ void JSUIExtensionConnection::CallJsFailed(int32_t errorCode) napi_value JSUIExtensionConnection::CallObjectMethod(const char* name, napi_value const *argv, size_t argc) { - TAG_LOGD(AAFwkTag::CONTEXT, "name:%{public}s", name); + TAG_LOGD(AAFwkTag::UISERVC_EXT, "name:%{public}s", name); if (!jsConnectionObject_) { - TAG_LOGW(AAFwkTag::CONTEXT, "Not found jsConnectionObject_"); + TAG_LOGW(AAFwkTag::UISERVC_EXT, "null jsConnectionObject_"); return nullptr; } HandleScope handleScope(env_); napi_value obj = jsConnectionObject_->GetNapiValue(); if (!CheckTypeForNapiValue(env_, obj, napi_object)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get jsConnectionObject_ object"); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "jsConnectionObject_ type error"); return nullptr; } napi_value method = nullptr; napi_get_named_property(env_, obj, name, &method); if (!CheckTypeForNapiValue(env_, method, napi_function)) { - TAG_LOGE(AAFwkTag::CONTEXT, "Failed to get '%{public}s' from jsConnectionObject_ object", name); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "type error, method: '%{public}s'", name); return nullptr; } napi_value result = nullptr; napi_call_function(env_, obj, method, argc, argv, &result); - TAG_LOGD(AAFwkTag::CONTEXT, "CallFunction(%{public}s) ok", name); + TAG_LOGD(AAFwkTag::UISERVC_EXT, "callFunction(%{public}s) ok", name); return result; } diff --git a/frameworks/native/ability/native/ui_extension_ability/js_uiservice_uiext_connection.cpp b/frameworks/native/ability/native/ui_extension_ability/js_uiservice_uiext_connection.cpp index 309ed4b4d46..3b46c61e87f 100644 --- a/frameworks/native/ability/native/ui_extension_ability/js_uiservice_uiext_connection.cpp +++ b/frameworks/native/ability/native/ui_extension_ability/js_uiservice_uiext_connection.cpp @@ -59,7 +59,7 @@ void RemoveUIServiceExtensionConnection(const int64_t& connectId) } else { TAG_LOGI(AAFwkTag::UI_EXT, "not found"); } - TAG_LOGI(AAFwkTag::CONTEXT, "Connects new size:%{public}zu", gUiServiceExtConnects.size()); + TAG_LOGI(AAFwkTag::UI_EXT, "connects new size:%{public}zu", gUiServiceExtConnects.size()); } void FindUIServiceExtensionConnection(const int64_t& connectId, AAFwk::Want& want, diff --git a/frameworks/native/ability/native/ui_extension_ability/ui_extension_context.cpp b/frameworks/native/ability/native/ui_extension_ability/ui_extension_context.cpp index c98a41ab363..3615facdfca 100755 --- a/frameworks/native/ability/native/ui_extension_ability/ui_extension_context.cpp +++ b/frameworks/native/ability/native/ui_extension_ability/ui_extension_context.cpp @@ -287,7 +287,7 @@ ErrCode UIExtensionContext::AddFreeInstallObserver(const sptrAddFreeInstallObserver(token_, observer); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::CONTEXT, "AddFreeInstallObserver error, ret: %{public}d", ret); + TAG_LOGE(AAFwkTag::UI_EXT, "error, ret: %{public}d", ret); } return ret; } -- Gitee