From 3df460c84c22f070dd367e5e9b64ad327be2c251 Mon Sep 17 00:00:00 2001 From: songjindian Date: Thu, 1 Aug 2024 11:19:38 +0800 Subject: [PATCH] =?UTF-8?q?ability=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 --- .../ability_runtime/cj_ability_object.cpp | 38 +-- .../native/ability_runtime/cj_ui_ability.cpp | 172 +++++----- .../native/ability_runtime/js_ui_ability.cpp | 317 +++++++++--------- .../js_uiservice_ability_connection.cpp | 8 +- .../js_fill_request_callback.cpp | 2 +- .../native/ability/native/ui_ability.cpp | 209 ++++++------ .../native/ability/native/ui_ability_impl.cpp | 182 +++++----- .../ability/native/ui_ability_thread.cpp | 183 +++++----- .../ui_service_extension.cpp | 4 +- .../native/appkit/app/ohos_application.cpp | 4 +- 10 files changed, 551 insertions(+), 568 deletions(-) diff --git a/frameworks/native/ability/native/ability_runtime/cj_ability_object.cpp b/frameworks/native/ability/native/ability_runtime/cj_ability_object.cpp index c159c74a249..10d04ce4e4f 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ability_object.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ability_object.cpp @@ -32,20 +32,20 @@ CJAbilityFuncs* g_cjAbilityFuncs = nullptr; void RegisterCJAbilityFuncs(void (*registerFunc)(CJAbilityFuncs*)) { - TAG_LOGD(AAFwkTag::UIABILITY, "RegisterCJAbilityFuncs start."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (g_cjAbilityFuncs != nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Repeated registration for cj functions of CJAbility."); + TAG_LOGE(AAFwkTag::UIABILITY, "repeated registration for cj functions"); return; } if (registerFunc == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "RegisterCJAbilityFuncs failed, registerFunc is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null registerFunc"); return; } g_cjAbilityFuncs = new CJAbilityFuncs(); registerFunc(g_cjAbilityFuncs); - TAG_LOGD(AAFwkTag::UIABILITY, "RegisterCJAbilityFuncs end."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } namespace OHOS { @@ -53,13 +53,13 @@ namespace AbilityRuntime { std::shared_ptr CJAbilityObject::LoadModule(const std::string& name) { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return nullptr; } auto id = g_cjAbilityFuncs->cjAbilityCreate(name.c_str()); if (id == 0) { TAG_LOGE(AAFwkTag::UIABILITY, - "Failed to invoke CJAbilityObject::LoadModule. Ability: %{public}s is not registered.", name.c_str()); + "failed to invoke , ability: %{public}s is not registered", name.c_str()); return nullptr; } return std::make_shared(id); @@ -76,7 +76,7 @@ CJAbilityObject::~CJAbilityObject() void CJAbilityObject::OnStart(const AAFwk::Want& want, const AAFwk::LaunchParam& launchParam) const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } WantHandle wantHandle = const_cast(&want); @@ -89,7 +89,7 @@ void CJAbilityObject::OnStart(const AAFwk::Want& want, const AAFwk::LaunchParam& void CJAbilityObject::OnStop() const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } g_cjAbilityFuncs->cjAbilityOnStop(id_); @@ -98,7 +98,7 @@ void CJAbilityObject::OnStop() const void CJAbilityObject::OnSceneCreated(OHOS::Rosen::CJWindowStageImpl* cjWindowStage) const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } WindowStagePtr windowStage = reinterpret_cast(cjWindowStage); @@ -108,7 +108,7 @@ void CJAbilityObject::OnSceneCreated(OHOS::Rosen::CJWindowStageImpl* cjWindowSta void CJAbilityObject::OnSceneRestored(OHOS::Rosen::CJWindowStageImpl* cjWindowStage) const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } WindowStagePtr windowStage = reinterpret_cast(cjWindowStage); @@ -118,7 +118,7 @@ void CJAbilityObject::OnSceneRestored(OHOS::Rosen::CJWindowStageImpl* cjWindowSt void CJAbilityObject::OnSceneDestroyed() const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } g_cjAbilityFuncs->cjAbilityOnSceneDestroyed(id_); @@ -127,7 +127,7 @@ void CJAbilityObject::OnSceneDestroyed() const void CJAbilityObject::OnForeground(const Want& want) const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } WantHandle wantHandle = const_cast(&want); @@ -137,7 +137,7 @@ void CJAbilityObject::OnForeground(const Want& want) const void CJAbilityObject::OnBackground() const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } g_cjAbilityFuncs->cjAbilityOnBackground(id_); @@ -146,7 +146,7 @@ void CJAbilityObject::OnBackground() const void CJAbilityObject::OnConfigurationUpdated(const std::shared_ptr& configuration) const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } } @@ -154,7 +154,7 @@ void CJAbilityObject::OnConfigurationUpdated(const std::shared_ptr(&want); @@ -167,14 +167,14 @@ void CJAbilityObject::OnNewWant(const AAFwk::Want& want, const AAFwk::LaunchPara void CJAbilityObject::Dump(const std::vector& params, std::vector& info) const { if (g_cjAbilityFuncs == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ functions for CJAbility are not registered"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityFunc"); return; } VectorStringHandle paramHandle = const_cast*>(¶ms); VectorStringHandle cjInfo = g_cjAbilityFuncs->cjAbilityDump(id_, paramHandle); if (cjInfo == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJ info nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null cj info"); return; } @@ -190,7 +190,7 @@ void CJAbilityObject::Dump(const std::vector& params, std::vectorcjAbilityInit(id_, ability); diff --git a/frameworks/native/ability/native/ability_runtime/cj_ui_ability.cpp b/frameworks/native/ability/native/ability_runtime/cj_ui_ability.cpp index 3d0e2b83b4b..1b8c7d4e5a0 100644 --- a/frameworks/native/ability/native/ability_runtime/cj_ui_ability.cpp +++ b/frameworks/native/ability/native/ability_runtime/cj_ui_ability.cpp @@ -106,12 +106,12 @@ void CJUIAbility::Init(std::shared_ptr record, { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (record == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityLocalRecord is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null local record"); return; } auto abilityInfo = record->GetAbilityInfo(); if (abilityInfo == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityInfo is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo"); return; } UIAbility::Init(record, application, handler, token); @@ -129,12 +129,12 @@ void CJUIAbility::SetAbilityContext( const std::shared_ptr &abilityInfo) { if (!abilityInfo) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityInfo is nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo"); return; } cjAbilityObj_ = CJAbilityObject::LoadModule(abilityInfo->name); if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get CJAbility object."); + TAG_LOGE(AAFwkTag::UIABILITY, "get CJAbility object failed"); return; } cjAbilityObj_->Init(this); @@ -143,11 +143,11 @@ void CJUIAbility::SetAbilityContext( void CJUIAbility::OnStart(const Want &want, sptr sessionInfo) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability is %{public}s", GetAbilityName().c_str()); UIAbility::OnStart(want, sessionInfo); if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cJAbility"); return; } std::string methodName = "OnStart"; @@ -157,17 +157,16 @@ void CJUIAbility::OnStart(const Want &want, sptr sessionInfo auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformStart."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformStart"); delegator->PostPerformStart(CreateADelegatorAbilityProperty()); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); } void CJUIAbility::AddLifecycleEventBeforeCall(FreezeUtil::TimeoutState state, const std::string &methodName) const { FreezeUtil::LifecycleFlow flow = { AbilityContext::token_, state }; auto entry = std::to_string(TimeUtil::SystemTimeMillisecond()) + "; CJUIAbility::" + methodName + - "; the " + methodName + " begin."; + "; the " + methodName + " begin"; FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); } @@ -175,32 +174,32 @@ void CJUIAbility::AddLifecycleEventAfterCall(FreezeUtil::TimeoutState state, con { FreezeUtil::LifecycleFlow flow = { AbilityContext::token_, state }; auto entry = std::to_string(TimeUtil::SystemTimeMillisecond()) + "; CJUIAbility::" + methodName + - "; the " + methodName + " end."; + "; the " + methodName + " end"; FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); } int32_t CJUIAbility::OnShare(WantParams &wantParams) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); return ERR_OK; } void CJUIAbility::OnStop() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityContext_) { - TAG_LOGD(AAFwkTag::UIABILITY, "Set terminating true."); + TAG_LOGD(AAFwkTag::UIABILITY, "set terminating true"); abilityContext_->SetTerminating(true); } UIAbility::OnStop(); if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj"); return; } cjAbilityObj_->OnStop(); CJUIAbility::OnStopCallback(); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void CJUIAbility::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callbackInfo, bool &isAsyncCallback) @@ -214,30 +213,30 @@ void CJUIAbility::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callbackI HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); TAG_LOGD(AAFwkTag::UIABILITY, "Begin"); if (abilityContext_) { - TAG_LOGD(AAFwkTag::UIABILITY, "Set terminating true."); + TAG_LOGD(AAFwkTag::UIABILITY, "set terminating true"); abilityContext_->SetTerminating(true); } UIAbility::OnStop(); cjAbilityObj_->OnStop(); OnStopCallback(); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void CJUIAbility::OnStopCallback() { auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformStop."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformStop"); delegator->PostPerformStop(CreateADelegatorAbilityProperty()); } bool ret = ConnectionManager::GetInstance().DisconnectCaller(AbilityContext::token_); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "The service connection is disconnected."); + TAG_LOGE(AAFwkTag::UIABILITY, "the service connection is disconnected"); } ConnectionManager::GetInstance().ReportConnectionLeakEvent(getpid(), gettid()); - TAG_LOGD(AAFwkTag::UIABILITY, "The service connection is not disconnected."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } #ifdef SUPPORT_GRAPHICS @@ -245,16 +244,16 @@ void CJUIAbility::OnStopCallback() void CJUIAbility::OnSceneCreated() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnSceneCreated(); if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj"); return; } cjWindowStage_ = CreateCJWindowStage(GetScene()); if (!cjWindowStage_) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to create CJWindowStage object."); + TAG_LOGE(AAFwkTag::UIABILITY, "create CJWindowStage object failed"); return; } @@ -268,11 +267,11 @@ void CJUIAbility::OnSceneCreated() auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformScenceCreated."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformScenceCreated"); delegator->PostPerformScenceCreated(CreateADelegatorAbilityProperty()); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void CJUIAbility::OnSceneRestored() @@ -281,14 +280,14 @@ void CJUIAbility::OnSceneRestored() TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj"); return; } if (!cjWindowStage_) { cjWindowStage_ = CreateCJWindowStage(scene_); if (!cjWindowStage_) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to create CJWindowStage object."); + TAG_LOGE(AAFwkTag::UIABILITY, "failed to create CJWindowStage object"); return; } } @@ -296,18 +295,18 @@ void CJUIAbility::OnSceneRestored() auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformScenceRestored."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformScenceRestored"); delegator->PostPerformScenceRestored(CreateADelegatorAbilityProperty()); } } void CJUIAbility::OnSceneDestroyed() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability is %{public}s", GetAbilityName().c_str()); UIAbility::onSceneDestroyed(); if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj"); return; } cjAbilityObj_->OnSceneDestroyed(); @@ -315,23 +314,23 @@ void CJUIAbility::OnSceneDestroyed() if (scene_ != nullptr) { auto window = scene_->GetMainWindow(); if (window != nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call window UnregisterDisplayMoveListener."); + TAG_LOGD(AAFwkTag::UIABILITY, "window UnregisterDisplayMoveListener"); window->UnregisterDisplayMoveListener(abilityDisplayMoveListener_); } } auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call delegator PostPerformScenceDestroyed."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformScenceDestroyed"); delegator->PostPerformScenceDestroyed(CreateADelegatorAbilityProperty()); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void CJUIAbility::OnForeground(const Want &want) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnForeground(want); CallOnForegroundFunc(want); @@ -340,7 +339,7 @@ void CJUIAbility::OnForeground(const Want &want) void CJUIAbility::CallOnForegroundFunc(const Want &want) { if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj"); return; } std::string methodName = "OnForeground"; @@ -350,22 +349,22 @@ void CJUIAbility::CallOnForegroundFunc(const Want &want) auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformForeground."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformForeground"); delegator->PostPerformForeground(CreateADelegatorAbilityProperty()); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void CJUIAbility::OnBackground() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnBackground(); if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj"); return; } std::string methodName = "OnBackground"; @@ -375,17 +374,17 @@ void CJUIAbility::OnBackground() auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformBackground."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformBackground"); delegator->PostPerformBackground(CreateADelegatorAbilityProperty()); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } bool CJUIAbility::OnBackPress() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability: %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnBackPress(); return true; } @@ -393,7 +392,7 @@ bool CJUIAbility::OnBackPress() bool CJUIAbility::OnPrepareTerminate() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability: %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnPrepareTerminate(); return true; @@ -424,7 +423,7 @@ void CJUIAbility::AbilityContinuationOrRecover(const Want &want) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); // multi-instance ability continuation - TAG_LOGD(AAFwkTag::UIABILITY, "Launch reason is %{public}d.", launchParam_.launchReason); + TAG_LOGD(AAFwkTag::UIABILITY, "launch reason: %{public}d", launchParam_.launchReason); if (IsRestoredInContinuation()) { RestorePageStack(want); OnSceneRestored(); @@ -442,7 +441,7 @@ void CJUIAbility::DoOnForeground(const Want &want) HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (scene_ == nullptr) { if ((abilityContext_ == nullptr) || (sceneListener_ == nullptr)) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityContext or sceneListener_ is nullptr ."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext or sceneListener"); return; } scene_ = std::make_shared(); @@ -450,32 +449,31 @@ void CJUIAbility::DoOnForeground(const Want &want) } else { auto window = scene_->GetMainWindow(); if (window == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "MainWindow is nullptr ."); + TAG_LOGE(AAFwkTag::UIABILITY, "null MainWindow"); return; } if (want.HasParameter(Want::PARAM_RESV_WINDOW_MODE)) { - TAG_LOGE(AAFwkTag::UIABILITY, "want has parameter PARAM_RESV_WINDOW_MODE."); + TAG_LOGI(AAFwkTag::UIABILITY, "recv window mode"); auto windowMode = want.GetIntParam( Want::PARAM_RESV_WINDOW_MODE, AAFwk::AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_UNDEFINED); window->SetWindowMode(static_cast(windowMode)); windowMode_ = windowMode; - TAG_LOGD(AAFwkTag::UIABILITY, "Set window mode is %{public}d .", windowMode); + TAG_LOGD(AAFwkTag::UIABILITY, "set window mode: %{public}d", windowMode); } } auto window = scene_->GetMainWindow(); if (window == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "MainWindow is nullptr ."); + TAG_LOGE(AAFwkTag::UIABILITY, "null window"); return; } if (securityFlag_) { window->SetSystemPrivacyMode(true); } - TAG_LOGD(AAFwkTag::UIABILITY, "Move scene to foreground, sceneFlag_: %{public}d .", UIAbility::sceneFlag_); + TAG_LOGD(AAFwkTag::UIABILITY, "move scene to foreground, sceneFlag_: %{public}d", UIAbility::sceneFlag_); AddLifecycleEventBeforeCall(FreezeUtil::TimeoutState::FOREGROUND, METHOD_NAME); scene_->GoForeground(UIAbility::sceneFlag_); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); } void CJUIAbility::InitSceneDoOnForeground(std::shared_ptr scene, const Want &want) @@ -488,9 +486,9 @@ void CJUIAbility::InitSceneDoOnForeground(std::shared_ptr sc bool flag = std::regex_match(strDisplayId, sm, formatRegex); if (flag && !strDisplayId.empty()) { displayId = strtol(strDisplayId.c_str(), nullptr, BASE_DISPLAY_ID_NUM); - TAG_LOGD(AAFwkTag::UIABILITY, "Success displayId is %{public}d .", displayId); + TAG_LOGD(AAFwkTag::UIABILITY, "displayId: %{public}d", displayId); } else { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to formatRegex: [%{public}s] .", strDisplayId.c_str()); + TAG_LOGE(AAFwkTag::UIABILITY, "formatRegex: [%{public}s] failed", strDisplayId.c_str()); } } Rosen::WMError ret = Rosen::WMError::WM_OK; @@ -503,7 +501,7 @@ void CJUIAbility::InitSceneDoOnForeground(std::shared_ptr sc ret = scene_->Init(displayId, abilityContext_, sceneListener_, option); } if (ret != Rosen::WMError::WM_OK) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to init window scene ."); + TAG_LOGE(AAFwkTag::UIABILITY, "init window scene failed"); return; } @@ -511,10 +509,10 @@ void CJUIAbility::InitSceneDoOnForeground(std::shared_ptr sc auto window = scene_->GetMainWindow(); if (window) { TAG_LOGD(AAFwkTag::UIABILITY, - "Call RegisterDisplayMoveListener, windowId: %{public}d .", window->GetWindowId()); + "call RegisterDisplayMoveListener, windowId: %{public}d", window->GetWindowId()); abilityDisplayMoveListener_ = new AbilityDisplayMoveListener(weak_from_this()); if (abilityDisplayMoveListener_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityDisplayMoveListener_ is nullptr ."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityDisplayMoveListener_"); return; } window->RegisterDisplayMoveListener(abilityDisplayMoveListener_); @@ -523,9 +521,9 @@ void CJUIAbility::InitSceneDoOnForeground(std::shared_ptr sc void CJUIAbility::RequestFocus(const Want &want) { - TAG_LOGD(AAFwkTag::UIABILITY, "Lifecycle: begin ."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "scene_ is nullptr ."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene_"); return; } auto window = scene_->GetMainWindow(); @@ -533,18 +531,18 @@ void CJUIAbility::RequestFocus(const Want &want) auto windowMode = want.GetIntParam( Want::PARAM_RESV_WINDOW_MODE, AAFwk::AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_UNDEFINED); window->SetWindowMode(static_cast(windowMode)); - TAG_LOGD(AAFwkTag::UIABILITY, "Set window mode is %{public}d .", windowMode); + TAG_LOGD(AAFwkTag::UIABILITY, "set window mode: %{public}d", windowMode); } AddLifecycleEventBeforeCall(FreezeUtil::TimeoutState::FOREGROUND, METHOD_NAME); scene_->GoForeground(UIAbility::sceneFlag_); - TAG_LOGD(AAFwkTag::UIABILITY, "Lifecycle: end ."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void CJUIAbility::ContinuationRestore(const Want &want) { - TAG_LOGD(AAFwkTag::UIABILITY, "Called ."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (!IsRestoredInContinuation() || scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Is not in continuation or scene_ is nullptr ."); + TAG_LOGE(AAFwkTag::UIABILITY, "is not in continuation or null scene_"); return; } RestorePageStack(want); @@ -561,19 +559,19 @@ void CJUIAbility::ExecuteInsightIntentRepeateForeground(const Want &want, const std::shared_ptr &executeParam, std::unique_ptr callback) { - TAG_LOGD(AAFwkTag::UIABILITY, "called ."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (executeParam == nullptr) { - TAG_LOGW(AAFwkTag::UIABILITY, "Intention execute param invalid."); + TAG_LOGW(AAFwkTag::UIABILITY, "invalid param"); RequestFocus(want); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), ERR_OK); return; } auto asyncCallback = [weak = weak_from_this(), want](InsightIntentExecuteResult result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin request focus ."); + TAG_LOGD(AAFwkTag::UIABILITY, "begin request focus"); auto ability = weak.lock(); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability is nullptr ."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->RequestFocus(want); @@ -583,7 +581,7 @@ void CJUIAbility::ExecuteInsightIntentRepeateForeground(const Want &want, InsightIntentExecutorInfo executeInfo; auto ret = GetInsightIntentExecutorInfo(want, executeParam, executeInfo); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get Intention executor failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get intention executor failed"); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), static_cast(AbilityErrorCode::ERROR_CODE_INVALID_PARAM)); return; @@ -596,7 +594,7 @@ void CJUIAbility::ExecuteInsightIntentMoveToForeground(const Want &want, { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (executeParam == nullptr) { - TAG_LOGW(AAFwkTag::UIABILITY, "Intention execute param invalid."); + TAG_LOGW(AAFwkTag::UIABILITY, "param invalid"); OnForeground(want); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), ERR_OK); return; @@ -605,10 +603,10 @@ void CJUIAbility::ExecuteInsightIntentMoveToForeground(const Want &want, UIAbility::OnForeground(want); auto asyncCallback = [weak = weak_from_this(), want](InsightIntentExecuteResult result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin call onForeground."); + TAG_LOGD(AAFwkTag::UIABILITY, "begin call onForeground"); auto ability = weak.lock(); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->CallOnForegroundFunc(want); @@ -618,7 +616,7 @@ void CJUIAbility::ExecuteInsightIntentMoveToForeground(const Want &want, InsightIntentExecutorInfo executeInfo; auto ret = GetInsightIntentExecutorInfo(want, executeParam, executeInfo); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get Intention executor failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get Intention executor failed"); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), static_cast(AbilityErrorCode::ERROR_CODE_INVALID_PARAM)); return; @@ -632,7 +630,7 @@ bool CJUIAbility::GetInsightIntentExecutorInfo(const Want &want, TAG_LOGD(AAFwkTag::UIABILITY, "called"); auto context = GetAbilityContext(); if (executeParam == nullptr || context == nullptr || abilityInfo_ == nullptr || cjWindowStage_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Param invalid."); + TAG_LOGE(AAFwkTag::UIABILITY, "invalid param"); return false; } @@ -650,11 +648,11 @@ bool CJUIAbility::GetInsightIntentExecutorInfo(const Want &want, int32_t CJUIAbility::OnContinue(WantParams &wantParams) { if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj_"); return AppExecFwk::ContinuationManagerStage::OnContinueResult::REJECT; } auto res = cjAbilityObj_->OnContinue(wantParams); - TAG_LOGD(AAFwkTag::UIABILITY, "CJAbility::OnContinue end, return value is %{public}d", res); + TAG_LOGD(AAFwkTag::UIABILITY, "end, value: %{public}d", res); return res; } @@ -670,17 +668,17 @@ void CJUIAbility::OnConfigurationUpdated(const Configuration &configuration) TAG_LOGD(AAFwkTag::UIABILITY, "called"); auto fullConfig = GetAbilityContext()->GetConfiguration(); if (!fullConfig) { - TAG_LOGE(AAFwkTag::UIABILITY, "configuration is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null configuration"); return; } if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj_"); return; } cjAbilityObj_->OnConfigurationUpdated(fullConfig); - TAG_LOGD(AAFwkTag::UIABILITY, "CJAbility::OnConfigurationUpdated end"); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void CJUIAbility::OnMemoryLevel(int level) @@ -696,7 +694,7 @@ void CJUIAbility::UpdateContextConfiguration() void CJUIAbility::OnNewWant(const Want &want) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); UIAbility::OnNewWant(want); #ifdef SUPPORT_GRAPHICS @@ -707,7 +705,7 @@ void CJUIAbility::OnNewWant(const Want &want) #endif #endif if (!cjAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "CJAbility is not loaded."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbilityObj_"); return; } std::string methodName = "OnNewWant"; @@ -715,19 +713,19 @@ void CJUIAbility::OnNewWant(const Want &want) cjAbilityObj_->OnNewWant(want, GetLaunchParam()); AddLifecycleEventAfterCall(FreezeUtil::TimeoutState::FOREGROUND, methodName); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void CJUIAbility::OnAbilityResult(int requestCode, int resultCode, const Want &resultData) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); UIAbility::OnAbilityResult(requestCode, resultCode, resultData); if (abilityContext_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext_ is nullptr ."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext_"); return; } abilityContext_->OnAbilityResult(requestCode, resultCode, resultData); - TAG_LOGD(AAFwkTag::UIABILITY, "End ."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } sptr CJUIAbility::CallRequest() @@ -738,7 +736,7 @@ sptr CJUIAbility::CallRequest() std::shared_ptr CJUIAbility::CreateADelegatorAbilityProperty() { if (abilityContext_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext_"); return nullptr; } auto property = std::make_shared(); @@ -764,18 +762,18 @@ void CJUIAbility::Dump(const std::vector ¶ms, std::vectorDump(params, info); - TAG_LOGD(AAFwkTag::UIABILITY, "Dump info size: %{public}zu.", info.size()); + TAG_LOGD(AAFwkTag::UIABILITY, "dump, size: %{public}zu", info.size()); } std::shared_ptr CJUIAbility::GetCJAbility() { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (cjAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "cjAbility object is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null cjAbility object"); } return cjAbilityObj_; } diff --git a/frameworks/native/ability/native/ability_runtime/js_ui_ability.cpp b/frameworks/native/ability/native/ability_runtime/js_ui_ability.cpp index c09dc8ea023..c77d1cd1805 100644 --- a/frameworks/native/ability/native/ability_runtime/js_ui_ability.cpp +++ b/frameworks/native/ability/native/ability_runtime/js_ui_ability.cpp @@ -82,7 +82,7 @@ napi_value OnContinuePromiseCallback(napi_env env, napi_callback_info info) NAPI_CALL_NO_THROW(napi_get_cb_info(env, info, &argc, &argv, nullptr, &data), nullptr); int32_t onContinueRes = 0; if (!ConvertFromJsValue(env, argv, onContinueRes)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get js return value failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get value failed"); return nullptr; } auto *callbackInfo = static_cast *>(data); @@ -96,20 +96,20 @@ napi_value OnContinuePromiseCallback(napi_env env, napi_callback_info info) napi_value AttachJsAbilityContext(napi_env env, void *value, void *extValue) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (value == nullptr || extValue == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Invalid parameter."); + TAG_LOGE(AAFwkTag::UIABILITY, "invalid params"); return nullptr; } auto ptr = reinterpret_cast *>(value)->lock(); if (ptr == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Invalid context."); + TAG_LOGE(AAFwkTag::UIABILITY, "null context"); return nullptr; } std::shared_ptr systemModule = nullptr; auto screenModePtr = reinterpret_cast *>(extValue)->lock(); if (screenModePtr == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Invalid screenModePtr."); + TAG_LOGE(AAFwkTag::UIABILITY, "nul screenModePtr"); return nullptr; } if (*screenModePtr == AAFwk::IDLE_SCREEN_MODE) { @@ -131,7 +131,7 @@ napi_value AttachJsAbilityContext(napi_env env, void *value, void *extValue) if (workContext != nullptr) { napi_wrap(env, contextObj, workContext, [](napi_env, void* data, void*) { - TAG_LOGD(AAFwkTag::UIABILITY, "Finalizer for weak_ptr ability context is called"); + TAG_LOGD(AAFwkTag::UIABILITY, "finalizer for weak_ptr ability context is called"); delete static_cast *>(data); }, nullptr, nullptr); @@ -170,12 +170,12 @@ void JsUIAbility::Init(std::shared_ptr record, { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (record == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityLocalRecord is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null localAbilityRecord"); return; } auto abilityInfo = record->GetAbilityInfo(); if (abilityInfo == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityInfo is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo"); return; } UIAbility::Init(record, application, handler, token); @@ -195,14 +195,14 @@ void JsUIAbility::Init(std::shared_ptr record, srcPath.append("/").append(abilityInfo->name).append(".abc"); } else { if (abilityInfo->srcEntrance.empty()) { - TAG_LOGE(AAFwkTag::UIABILITY, "SrcEntrance is empty."); + TAG_LOGE(AAFwkTag::UIABILITY, "empty srcEntrance"); return; } srcPath.append("/"); srcPath.append(abilityInfo->srcEntrance); srcPath.erase(srcPath.rfind(".")); srcPath.append(".abc"); - TAG_LOGD(AAFwkTag::UIABILITY, "JsAbility srcPath is %{public}s.", srcPath.c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "jsAbility srcPath: %{public}s", srcPath.c_str()); } std::string moduleName(abilityInfo->moduleName); @@ -220,24 +220,24 @@ void JsUIAbility::SetAbilityContext(std::shared_ptr abilityInfo, jsAbilityObj_ = jsRuntime_.LoadModule( moduleName, srcPath, abilityInfo->hapPath, abilityInfo->compileMode == AppExecFwk::CompileMode::ES_MODULE); if (jsAbilityObj_ == nullptr || abilityContext_ == nullptr || want == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "jsAbilityObj_ or abilityContext_ or want is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAbilityObj_ or abilityContext_ or want"); return; } napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to check type"); + TAG_LOGE(AAFwkTag::UIABILITY, "check type failed"); return; } napi_value contextObj = nullptr; int32_t screenMode = want->GetIntParam(AAFwk::SCREEN_MODE_KEY, AAFwk::ScreenMode::IDLE_SCREEN_MODE); CreateJSContext(env, contextObj, screenMode); if (shellContextRef_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "shellContextRef_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null shellContextRef_"); return; } contextObj = shellContextRef_->GetNapiValue(); if (!CheckTypeForNapiValue(env, contextObj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get ability native object."); + TAG_LOGE(AAFwkTag::UIABILITY, "get ability native object failed"); return; } auto workContext = new (std::nothrow) std::weak_ptr(abilityContext_); @@ -249,16 +249,16 @@ void JsUIAbility::SetAbilityContext(std::shared_ptr abilityInfo, env, contextObj, DetachCallbackFunc, AttachJsAbilityContext, workContext, workScreenMode); abilityContext_->Bind(jsRuntime_, shellContextRef_.get()); napi_set_named_property(env, obj, "context", contextObj); - TAG_LOGD(AAFwkTag::UIABILITY, "Set ability context"); + TAG_LOGD(AAFwkTag::UIABILITY, "set ability context"); if (abilityRecovery_ != nullptr) { abilityRecovery_->SetJsAbility(reinterpret_cast(workContext)); } napi_wrap(env, contextObj, workContext, [](napi_env, void *data, void *) { - TAG_LOGD(AAFwkTag::UIABILITY, "Finalizer for weak_ptr ability context is called"); + TAG_LOGD(AAFwkTag::UIABILITY, "finalizer for weak_ptr ability context is called"); delete static_cast *>(data); }, nullptr, nullptr); - TAG_LOGD(AAFwkTag::UIABILITY, "Init end."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::CreateJSContext(napi_env env, napi_value &contextObj, int32_t screenMode) @@ -280,11 +280,11 @@ void JsUIAbility::CreateJSContext(napi_env env, napi_value &contextObj, int32_t void JsUIAbility::OnStart(const Want &want, sptr sessionInfo) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnStart(want, sessionInfo); if (!jsAbilityObj_) { - TAG_LOGE(AAFwkTag::UIABILITY, "Not found Ability.js."); + TAG_LOGE(AAFwkTag::UIABILITY, "not found Ability.js"); return; } @@ -293,13 +293,13 @@ void JsUIAbility::OnStart(const Want &want, sptr sessionInfo napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Error to get Ability object"); + TAG_LOGE(AAFwkTag::UIABILITY, "get ability object failed"); return; } napi_value jsWant = OHOS::AppExecFwk::WrapWant(env, want); if (jsWant == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "JsWant is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsWant"); return; } @@ -326,7 +326,7 @@ void JsUIAbility::OnStart(const Want &want, sptr sessionInfo auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformStart."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformStart"); delegator->PostPerformStart(CreateADelegatorAbilityProperty()); } @@ -334,14 +334,14 @@ void JsUIAbility::OnStart(const Want &want, sptr sessionInfo if (applicationContext != nullptr) { applicationContext->DispatchOnAbilityCreate(jsAbilityObj_); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::AddLifecycleEventBeforeJSCall(FreezeUtil::TimeoutState state, const std::string &methodName) const { FreezeUtil::LifecycleFlow flow = { AbilityContext::token_, state }; auto entry = std::to_string(TimeUtil::SystemTimeMillisecond()) + "; JsUIAbility::" + methodName + - "; the " + methodName + " begin."; + "; the " + methodName + " begin"; FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); } @@ -349,22 +349,22 @@ void JsUIAbility::AddLifecycleEventAfterJSCall(FreezeUtil::TimeoutState state, c { FreezeUtil::LifecycleFlow flow = { AbilityContext::token_, state }; auto entry = std::to_string(TimeUtil::SystemTimeMillisecond()) + "; JsUIAbility::" + methodName + - "; the " + methodName + " end."; + "; the " + methodName + " end"; FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); } int32_t JsUIAbility::OnShare(WantParams &wantParam) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); HandleScope handleScope(jsRuntime_); auto env = jsRuntime_.GetNapiEnv(); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get AbilityStage object."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability object"); return ERR_INVALID_VALUE; } napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get Ability object."); + TAG_LOGE(AAFwkTag::UIABILITY, "ability napi value failed"); return ERR_INVALID_VALUE; } @@ -374,16 +374,16 @@ int32_t JsUIAbility::OnShare(WantParams &wantParam) }; CallObjectMethod("onShare", argv, ArraySize(argv)); OHOS::AppExecFwk::UnwrapWantParams(env, jsWantParams, wantParam); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); return ERR_OK; } void JsUIAbility::OnStop() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityContext_) { - TAG_LOGD(AAFwkTag::UIABILITY, "Set terminating true."); + TAG_LOGD(AAFwkTag::UIABILITY, "set terminating true"); abilityContext_->SetTerminating(true); } UIAbility::OnStop(); @@ -394,7 +394,7 @@ void JsUIAbility::OnStop() } CallObjectMethod("onDestroy"); OnStopCallback(); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callbackInfo, bool &isAsyncCallback) @@ -408,7 +408,7 @@ void JsUIAbility::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callbackI HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); TAG_LOGD(AAFwkTag::UIABILITY, "Begin"); if (abilityContext_) { - TAG_LOGD(AAFwkTag::UIABILITY, "Set terminating true."); + TAG_LOGD(AAFwkTag::UIABILITY, "set terminating true"); abilityContext_->SetTerminating(true); } @@ -430,7 +430,7 @@ void JsUIAbility::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callbackI auto asyncCallback = [abilityWeakPtr = weakPtr]() { auto ability = abilityWeakPtr.lock(); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->OnStopCallback(); @@ -438,24 +438,24 @@ void JsUIAbility::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callbackI callbackInfo->Push(asyncCallback); isAsyncCallback = CallPromise(result, callbackInfo); if (!isAsyncCallback) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to call promise."); + TAG_LOGE(AAFwkTag::UIABILITY, "call promise failed"); OnStopCallback(); } - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::OnStopCallback() { auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformStop."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformStop"); delegator->PostPerformStop(CreateADelegatorAbilityProperty()); } bool ret = ConnectionManager::GetInstance().DisconnectCaller(AbilityContext::token_); if (ret) { ConnectionManager::GetInstance().ReportConnectionLeakEvent(getpid(), gettid()); - TAG_LOGD(AAFwkTag::UIABILITY, "The service connection is not disconnected."); + TAG_LOGD(AAFwkTag::UIABILITY, "the service connection is not disconnected"); } auto applicationContext = AbilityRuntime::Context::GetApplicationContext(); @@ -468,11 +468,11 @@ void JsUIAbility::OnStopCallback() void JsUIAbility::OnSceneCreated() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnSceneCreated(); auto jsAppWindowStage = CreateAppWindowStage(); if (jsAppWindowStage == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "JsAppWindowStage is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAppWindowStage"); return; } @@ -494,7 +494,7 @@ void JsUIAbility::OnSceneCreated() auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformScenceCreated."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformScenceCreated"); delegator->PostPerformScenceCreated(CreateADelegatorAbilityProperty()); } @@ -503,7 +503,7 @@ void JsUIAbility::OnSceneCreated() applicationContext->DispatchOnWindowStageCreate(jsAbilityObj_, jsWindowStageObj_); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::OnSceneRestored() @@ -514,7 +514,7 @@ void JsUIAbility::OnSceneRestored() HandleScope handleScope(jsRuntime_); auto jsAppWindowStage = CreateAppWindowStage(); if (jsAppWindowStage == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "JsAppWindowStage is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAppWindowStage"); return; } UpdateJsWindowStage(jsAppWindowStage->GetNapiValue()); @@ -531,17 +531,17 @@ void JsUIAbility::OnSceneRestored() auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformScenceRestored."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformScenceRestored"); delegator->PostPerformScenceRestored(CreateADelegatorAbilityProperty()); } } void JsUIAbility::OnSceneWillDestroy() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); HandleScope handleScope(jsRuntime_); if (jsWindowStageObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "jsWindowStageObj_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsWindowStageObj_"); return; } napi_value argv[] = {jsWindowStageObj_->GetNapiValue()}; @@ -554,7 +554,7 @@ void JsUIAbility::OnSceneWillDestroy() void JsUIAbility::onSceneDestroyed() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::onSceneDestroyed(); auto applicationContext = AbilityRuntime::Context::GetApplicationContext(); @@ -568,14 +568,14 @@ void JsUIAbility::onSceneDestroyed() if (scene_ != nullptr) { auto window = scene_->GetMainWindow(); if (window != nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call UnregisterDisplayMoveListener."); + TAG_LOGD(AAFwkTag::UIABILITY, "unRegisterDisplaymovelistener"); window->UnregisterDisplayMoveListener(abilityDisplayMoveListener_); } } auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformScenceDestroyed."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformScenceDestroyed"); delegator->PostPerformScenceDestroyed(CreateADelegatorAbilityProperty()); } @@ -583,13 +583,13 @@ void JsUIAbility::onSceneDestroyed() if (applicationContext != nullptr) { applicationContext->DispatchOnWindowStageDestroy(jsAbilityObj_, jsWindowStageObj_); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::OnForeground(const Want &want) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); if (abilityInfo_) { jsRuntime_.UpdateModuleNameAndAssetPath(abilityInfo_->moduleName); } @@ -607,18 +607,18 @@ void JsUIAbility::CallOnForegroundFunc(const Want &want) HandleScope handleScope(jsRuntime_); auto env = jsRuntime_.GetNapiEnv(); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "JsAbilityObj_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAbilityObj_"); return; } napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get Ability object."); + TAG_LOGE(AAFwkTag::UIABILITY, "get Ability object failed"); return; } napi_value jsWant = OHOS::AppExecFwk::WrapWant(env, want); if (jsWant == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "jsWant is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsWant"); return; } @@ -635,7 +635,7 @@ void JsUIAbility::CallOnForegroundFunc(const Want &want) auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformForeground."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformForeground"); delegator->PostPerformForeground(CreateADelegatorAbilityProperty()); } @@ -643,13 +643,13 @@ void JsUIAbility::CallOnForegroundFunc(const Want &want) if (applicationContext != nullptr) { applicationContext->DispatchOnAbilityForeground(jsAbilityObj_); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::OnBackground() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); auto applicationContext = AbilityRuntime::Context::GetApplicationContext(); if (applicationContext != nullptr) { applicationContext->DispatchOnAbilityWillBackground(jsAbilityObj_); @@ -664,7 +664,7 @@ void JsUIAbility::OnBackground() auto delegator = AppExecFwk::AbilityDelegatorRegistry::GetAbilityDelegator(); if (delegator) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call PostPerformBackground."); + TAG_LOGD(AAFwkTag::UIABILITY, "call PostPerformBackground"); delegator->PostPerformBackground(CreateADelegatorAbilityProperty()); } @@ -672,45 +672,45 @@ void JsUIAbility::OnBackground() if (applicationContext != nullptr) { applicationContext->DispatchOnAbilityBackground(jsAbilityObj_); } - TAG_LOGD(AAFwkTag::UIABILITY, "End ability is %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } bool JsUIAbility::OnBackPress() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability: %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnBackPress(); HandleScope handleScope(jsRuntime_); auto env = jsRuntime_.GetNapiEnv(); napi_value jsValue = CallObjectMethod("onBackPressed", nullptr, 0, true, false); bool defaultRet = BackPressDefaultValue(); if (jsValue == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "jsValue is nullptr, return defaultRet %{public}d.", defaultRet); + TAG_LOGD(AAFwkTag::UIABILITY, "null jsValue, return defaultRet %{public}d", defaultRet); return defaultRet; } bool ret = defaultRet; if (!ConvertFromJsValue(env, jsValue, ret)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get js value failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get js value failed"); return defaultRet; } - TAG_LOGD(AAFwkTag::UIABILITY, "End ret is %{public}d.", ret); + TAG_LOGD(AAFwkTag::UIABILITY, "end ret: %{public}d", ret); return ret; } bool JsUIAbility::OnPrepareTerminate() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability: %{public}s.", GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", GetAbilityName().c_str()); UIAbility::OnPrepareTerminate(); HandleScope handleScope(jsRuntime_); auto env = jsRuntime_.GetNapiEnv(); napi_value jsValue = CallObjectMethod("onPrepareToTerminate", nullptr, 0, true); bool ret = false; if (!ConvertFromJsValue(env, jsValue, ret)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get js value failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get js value failed"); return false; } - TAG_LOGD(AAFwkTag::UIABILITY, "End ret is %{public}d.", ret); + TAG_LOGD(AAFwkTag::UIABILITY, "end ret: %{public}d", ret); return ret; } @@ -721,7 +721,7 @@ std::unique_ptr JsUIAbility::CreateAppWindowStage() auto env = jsRuntime_.GetNapiEnv(); napi_value jsWindowStage = Rosen::CreateJsWindowStage(env, GetScene()); if (jsWindowStage == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to create jsWindowSatge object."); + TAG_LOGE(AAFwkTag::UIABILITY, "create jsWindowSatge failed"); return nullptr; } return JsRuntime::LoadSystemModuleByEngine(env, "application.WindowStage", &jsWindowStage, 1); @@ -751,7 +751,7 @@ void JsUIAbility::RestorePageStack(const Want &want) scene_->GetMainWindow()->NapiSetUIContent(pageStack, env, abilityContext_->GetContentStorage()->GetNapiValue(), Rosen::BackupAndRestoreType::CONTINUATION); } else { - TAG_LOGE(AAFwkTag::UIABILITY, "Content storage is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null content storage"); } } } @@ -760,7 +760,7 @@ void JsUIAbility::AbilityContinuationOrRecover(const Want &want) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); // multi-instance ability continuation - TAG_LOGD(AAFwkTag::UIABILITY, "Launch reason is %{public}d, last exit reasion is %{public}d.", + TAG_LOGD(AAFwkTag::UIABILITY, "launch reason: %{public}d, last exit reasion: %{public}d", launchParam_.launchReason, launchParam_.lastExitReason); if (IsRestoredInContinuation()) { RestorePageStack(want); @@ -775,12 +775,12 @@ void JsUIAbility::AbilityContinuationOrRecover(const Want &want) mainWindow->NapiSetUIContent(pageStack, env, abilityContext_->GetContentStorage()->GetNapiValue(), Rosen::BackupAndRestoreType::APP_RECOVERY); } else { - TAG_LOGE(AAFwkTag::UIABILITY, "MainWindow is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null mainWindow"); } OnSceneRestored(); } else { if (ShouldDefaultRecoverState(want) && abilityRecovery_ != nullptr && scene_ != nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "Need restore."); + TAG_LOGD(AAFwkTag::UIABILITY, "need restore"); std::string pageStack = abilityRecovery_->GetSavedPageStack(AppExecFwk::StateReason::DEVELOPER_REQUEST); auto mainWindow = scene_->GetMainWindow(); if (!pageStack.empty() && mainWindow != nullptr) { @@ -796,7 +796,7 @@ void JsUIAbility::DoOnForeground(const Want &want) HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (scene_ == nullptr) { if ((abilityContext_ == nullptr) || (sceneListener_ == nullptr)) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityContext or sceneListener_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext or sceneListener_"); return; } DoOnForegroundForSceneIsNull(want); @@ -807,7 +807,7 @@ void JsUIAbility::DoOnForeground(const Want &want) Want::PARAM_RESV_WINDOW_MODE, AAFwk::AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_UNDEFINED); window->SetWindowMode(static_cast(windowMode)); windowMode_ = windowMode; - TAG_LOGD(AAFwkTag::UIABILITY, "Set window mode is %{public}d.", windowMode); + TAG_LOGD(AAFwkTag::UIABILITY, "set window mode: %{public}d", windowMode); } } @@ -821,10 +821,10 @@ void JsUIAbility::DoOnForeground(const Want &want) return; } - TAG_LOGD(AAFwkTag::UIABILITY, "Move scene to foreground, sceneFlag_: %{public}d.", UIAbility::sceneFlag_); + TAG_LOGD(AAFwkTag::UIABILITY, "move scene to foreground, sceneFlag_: %{public}d", UIAbility::sceneFlag_); AddLifecycleEventBeforeJSCall(FreezeUtil::TimeoutState::FOREGROUND, METHOD_NAME); scene_->GoForeground(UIAbility::sceneFlag_); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::DoOnForegroundForSceneIsNull(const Want &want) @@ -838,9 +838,9 @@ void JsUIAbility::DoOnForegroundForSceneIsNull(const Want &want) bool flag = std::regex_match(strDisplayId, sm, formatRegex); if (flag && !strDisplayId.empty()) { displayId = strtol(strDisplayId.c_str(), nullptr, BASE_DISPLAY_ID_NUM); - TAG_LOGD(AAFwkTag::UIABILITY, "Success displayId is %{public}d.", displayId); + TAG_LOGD(AAFwkTag::UIABILITY, "displayId: %{public}d", displayId); } else { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to formatRegex: [%{public}s].", strDisplayId.c_str()); + TAG_LOGE(AAFwkTag::UIABILITY, "formatRegex: [%{public}s] failed", strDisplayId.c_str()); } } auto option = GetWindowOption(want); @@ -854,17 +854,17 @@ void JsUIAbility::DoOnForegroundForSceneIsNull(const Want &want) ret = scene_->Init(displayId, abilityContext_, sceneListener_, option); } if (ret != Rosen::WMError::WM_OK) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to init window scene."); + TAG_LOGE(AAFwkTag::UIABILITY, "init window scene failed"); return; } AbilityContinuationOrRecover(want); auto window = scene_->GetMainWindow(); if (window) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call RegisterDisplayMoveListener, windowId: %{public}d.", window->GetWindowId()); + TAG_LOGD(AAFwkTag::UIABILITY, "registerDisplayMoveListener, windowId: %{public}d", window->GetWindowId()); abilityDisplayMoveListener_ = new AbilityDisplayMoveListener(weak_from_this()); if (abilityDisplayMoveListener_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityDisplayMoveListener_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityDisplayMoveListener_"); return; } window->RegisterDisplayMoveListener(abilityDisplayMoveListener_); @@ -873,9 +873,9 @@ void JsUIAbility::DoOnForegroundForSceneIsNull(const Want &want) void JsUIAbility::RequestFocus(const Want &want) { - TAG_LOGI(AAFwkTag::UIABILITY, "Lifecycle: begin."); + TAG_LOGI(AAFwkTag::UIABILITY, "called"); if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "scene_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene_"); return; } auto window = scene_->GetMainWindow(); @@ -883,18 +883,18 @@ void JsUIAbility::RequestFocus(const Want &want) auto windowMode = want.GetIntParam( Want::PARAM_RESV_WINDOW_MODE, AAFwk::AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_UNDEFINED); window->SetWindowMode(static_cast(windowMode)); - TAG_LOGD(AAFwkTag::UIABILITY, "Set window mode is %{public}d.", windowMode); + TAG_LOGD(AAFwkTag::UIABILITY, "set window mode: %{public}d", windowMode); } AddLifecycleEventBeforeJSCall(FreezeUtil::TimeoutState::FOREGROUND, METHOD_NAME); scene_->GoForeground(UIAbility::sceneFlag_); - TAG_LOGI(AAFwkTag::UIABILITY, "Lifecycle: end."); + TAG_LOGI(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::ContinuationRestore(const Want &want) { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (!IsRestoredInContinuation() || scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Is not in continuation or scene_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "is not in continuation or null scene_"); return; } RestorePageStack(want); @@ -906,7 +906,7 @@ std::shared_ptr JsUIAbility::GetJsWindowStage() { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (jsWindowStageObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "JsWindowSatge is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsWindowStageObj_"); } return jsWindowStageObj_; } @@ -922,17 +922,17 @@ void JsUIAbility::ExecuteInsightIntentRepeateForeground(const Want &want, { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (executeParam == nullptr) { - TAG_LOGW(AAFwkTag::UIABILITY, "Intent execute param invalid."); + TAG_LOGW(AAFwkTag::UIABILITY, "invalid param"); RequestFocus(want); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), ERR_OK); return; } auto asyncCallback = [weak = weak_from_this(), want](InsightIntentExecuteResult result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin request focus."); + TAG_LOGD(AAFwkTag::UIABILITY, "request focus"); auto ability = weak.lock(); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->RequestFocus(want); @@ -942,7 +942,7 @@ void JsUIAbility::ExecuteInsightIntentRepeateForeground(const Want &want, InsightIntentExecutorInfo executeInfo; auto ret = GetInsightIntentExecutorInfo(want, executeParam, executeInfo); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get Intent executor failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get intentExecutor failed"); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), static_cast(AbilityErrorCode::ERROR_CODE_INVALID_PARAM)); return; @@ -952,7 +952,7 @@ void JsUIAbility::ExecuteInsightIntentRepeateForeground(const Want &want, jsRuntime_, executeInfo, std::move(callback)); if (!ret) { // callback has removed, release in insight intent executor. - TAG_LOGE(AAFwkTag::UIABILITY, "Execute insight intent failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "execute insightIntent failed"); } } @@ -962,7 +962,7 @@ void JsUIAbility::ExecuteInsightIntentMoveToForeground(const Want &want, { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (executeParam == nullptr) { - TAG_LOGW(AAFwkTag::UIABILITY, "Intent execute param invalid."); + TAG_LOGW(AAFwkTag::UIABILITY, "param invalid"); OnForeground(want); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), ERR_OK); return; @@ -974,10 +974,10 @@ void JsUIAbility::ExecuteInsightIntentMoveToForeground(const Want &want, UIAbility::OnForeground(want); auto asyncCallback = [weak = weak_from_this(), want](InsightIntentExecuteResult result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin call onForeground."); + TAG_LOGD(AAFwkTag::UIABILITY, "begin call onForeground"); auto ability = weak.lock(); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->CallOnForegroundFunc(want); @@ -987,7 +987,7 @@ void JsUIAbility::ExecuteInsightIntentMoveToForeground(const Want &want, InsightIntentExecutorInfo executeInfo; auto ret = GetInsightIntentExecutorInfo(want, executeParam, executeInfo); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get Intent executor failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get intentExecutor failed"); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), static_cast(AbilityErrorCode::ERROR_CODE_INVALID_PARAM)); return; @@ -997,7 +997,7 @@ void JsUIAbility::ExecuteInsightIntentMoveToForeground(const Want &want, jsRuntime_, executeInfo, std::move(callback)); if (!ret) { // callback has removed, release in insight intent executor. - TAG_LOGE(AAFwkTag::UIABILITY, "Execute insight intent failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "execute insightIntent failed"); } } @@ -1007,7 +1007,7 @@ void JsUIAbility::ExecuteInsightIntentBackground(const Want &want, { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (executeParam == nullptr) { - TAG_LOGW(AAFwkTag::UIABILITY, "Intent execute param invalid."); + TAG_LOGW(AAFwkTag::UIABILITY, "invalid executeParam"); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), ERR_OK); return; } @@ -1019,7 +1019,7 @@ void JsUIAbility::ExecuteInsightIntentBackground(const Want &want, InsightIntentExecutorInfo executeInfo; auto ret = GetInsightIntentExecutorInfo(want, executeParam, executeInfo); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get Intent executor failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get intentExecutor failed"); InsightIntentExecutorMgr::TriggerCallbackInner(std::move(callback), static_cast(AbilityErrorCode::ERROR_CODE_INVALID_PARAM)); return; @@ -1029,7 +1029,7 @@ void JsUIAbility::ExecuteInsightIntentBackground(const Want &want, jsRuntime_, executeInfo, std::move(callback)); if (!ret) { // callback has removed, release in insight intent executor. - TAG_LOGE(AAFwkTag::UIABILITY, "Execute insight intent failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "execute insightIntent failed"); } } @@ -1041,13 +1041,13 @@ bool JsUIAbility::GetInsightIntentExecutorInfo(const Want &want, auto context = GetAbilityContext(); if (executeParam == nullptr || context == nullptr || abilityInfo_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Param invalid."); + TAG_LOGE(AAFwkTag::UIABILITY, "param invalid"); return false; } if (executeParam->executeMode_ == AppExecFwk::ExecuteMode::UI_ABILITY_FOREGROUND && jsWindowStageObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Param invalid."); + TAG_LOGE(AAFwkTag::UIABILITY, "param invalid"); return false; } @@ -1071,12 +1071,12 @@ int32_t JsUIAbility::OnContinue(WantParams &wantParams) HandleScope handleScope(jsRuntime_); auto env = jsRuntime_.GetNapiEnv(); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get AbilityStage object."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAbilityObj_"); return AppExecFwk::ContinuationManagerStage::OnContinueResult::REJECT; } napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get Ability object."); + TAG_LOGE(AAFwkTag::UIABILITY, "failed get ability"); return AppExecFwk::ContinuationManagerStage::OnContinueResult::REJECT; } @@ -1095,7 +1095,7 @@ int32_t JsUIAbility::OnContinue(WantParams &wantParams) } } else { if (!CallPromise(result, onContinueRes)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to call promise."); + TAG_LOGE(AAFwkTag::UIABILITY, "call promise failed"); return AppExecFwk::ContinuationManagerStage::OnContinueResult::REJECT; } } @@ -1103,7 +1103,7 @@ int32_t JsUIAbility::OnContinue(WantParams &wantParams) if (applicationContext != nullptr) { applicationContext->DispatchOnAbilityContinue(jsAbilityObj_); } - TAG_LOGI(AAFwkTag::UIABILITY, "OnContinue end."); + TAG_LOGI(AAFwkTag::UIABILITY, "end"); return onContinueRes; } @@ -1112,12 +1112,12 @@ int32_t JsUIAbility::OnSaveState(int32_t reason, WantParams &wantParams) HandleScope handleScope(jsRuntime_); auto env = jsRuntime_.GetNapiEnv(); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AppRecoveryFailed to get AbilityStage object."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAbilityObj_"); return -1; } napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "AppRecovery Failed to get Ability object."); + TAG_LOGE(AAFwkTag::UIABILITY, "failed to get ability object"); return -1; } @@ -1129,7 +1129,7 @@ int32_t JsUIAbility::OnSaveState(int32_t reason, WantParams &wantParams) napi_value methodOnSaveState = nullptr; napi_get_named_property(env, obj, "onSaveState", &methodOnSaveState); if (methodOnSaveState == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AppRecovery Failed to get 'onSaveState' from Ability object."); + TAG_LOGE(AAFwkTag::UIABILITY, "failed to get 'onSaveState' fun"); return -1; } @@ -1142,7 +1142,7 @@ int32_t JsUIAbility::OnSaveState(int32_t reason, WantParams &wantParams) int32_t numberResult = 0; if (!ConvertFromJsValue(env, result, numberResult)) { - TAG_LOGE(AAFwkTag::UIABILITY, "AppRecovery no result return from onSaveState."); + TAG_LOGE(AAFwkTag::UIABILITY, "no result return from onSaveState"); return -1; } @@ -1159,7 +1159,7 @@ void JsUIAbility::OnConfigurationUpdated(const Configuration &configuration) UIAbility::OnConfigurationUpdated(configuration); TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityContext_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext"); return; } @@ -1167,7 +1167,7 @@ void JsUIAbility::OnConfigurationUpdated(const Configuration &configuration) auto env = jsRuntime_.GetNapiEnv(); auto fullConfig = abilityContext_->GetConfiguration(); if (fullConfig == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Configuration is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null configuration"); return; } @@ -1186,12 +1186,12 @@ void JsUIAbility::OnMemoryLevel(int level) HandleScope handleScope(jsRuntime_); auto env = jsRuntime_.GetNapiEnv(); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get AbilityStage object."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAbilityObj_"); return; } napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get Ability object."); + TAG_LOGE(AAFwkTag::UIABILITY, "get ability object failed"); return; } @@ -1204,7 +1204,7 @@ void JsUIAbility::UpdateContextConfiguration() { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityContext_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext_"); return; } HandleScope handleScope(jsRuntime_); @@ -1214,7 +1214,7 @@ void JsUIAbility::UpdateContextConfiguration() void JsUIAbility::OnNewWant(const Want &want) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); UIAbility::OnNewWant(want); #ifdef SUPPORT_SCREEN @@ -1226,18 +1226,18 @@ void JsUIAbility::OnNewWant(const Want &want) HandleScope handleScope(jsRuntime_); auto env = jsRuntime_.GetNapiEnv(); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get AbilityStage object."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAbilityObj_"); return; } napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get Ability object."); + TAG_LOGE(AAFwkTag::UIABILITY, "ability object failed"); return; } napi_value jsWant = OHOS::AppExecFwk::WrapWant(env, want); if (jsWant == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get want."); + TAG_LOGE(AAFwkTag::UIABILITY, "null want"); return; } @@ -1264,40 +1264,39 @@ void JsUIAbility::OnNewWant(const Want &want) if (applicationContext != nullptr) { applicationContext->DispatchOnNewWant(jsAbilityObj_); } - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void JsUIAbility::OnAbilityResult(int requestCode, int resultCode, const Want &resultData) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); UIAbility::OnAbilityResult(requestCode, resultCode, resultData); if (abilityContext_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext_"); return; } abilityContext_->OnAbilityResult(requestCode, resultCode, resultData); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } sptr JsUIAbility::CallRequest() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Obj is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext_"); return nullptr; } if (remoteCallee_ != nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "RemoteCallee is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null remoteCallee_"); return remoteCallee_; } HandleScope handleScope(jsRuntime_); - TAG_LOGD(AAFwkTag::UIABILITY, "Set runtime scope."); auto env = jsRuntime_.GetNapiEnv(); auto obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Value is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null value"); return nullptr; } @@ -1306,19 +1305,19 @@ sptr JsUIAbility::CallRequest() bool isCallable = false; napi_is_callable(env, method, &isCallable); if (!isCallable) { - TAG_LOGE(AAFwkTag::UIABILITY, "Method is %{public}s.", method == nullptr ? "nullptr" : "not func"); + TAG_LOGE(AAFwkTag::UIABILITY, "method: %{public}s", method == nullptr ? "nullptr" : "not func"); return nullptr; } napi_value remoteJsObj = nullptr; napi_call_function(env, obj, method, 0, nullptr, &remoteJsObj); if (remoteJsObj == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "JsObj is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null remoteJsObj"); return nullptr; } remoteCallee_ = SetNewRuleFlagToCallee(env, remoteJsObj); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); return remoteCallee_; } @@ -1326,9 +1325,9 @@ napi_value JsUIAbility::CallObjectMethod(const char *name, napi_value const *arg bool showMethodNotFoundLog) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, std::string("CallObjectMethod:") + name); - TAG_LOGD(AAFwkTag::UIABILITY, "Lifecycle: the begin of %{public}s", name); + TAG_LOGD(AAFwkTag::UIABILITY, "name %{public}s", name); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Not found Ability.js"); + TAG_LOGE(AAFwkTag::UIABILITY, "not found ability.js"); return nullptr; } @@ -1337,7 +1336,7 @@ napi_value JsUIAbility::CallObjectMethod(const char *name, napi_value const *arg napi_value obj = jsAbilityObj_->GetNapiValue(); if (!CheckTypeForNapiValue(env, obj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get Ability object."); + TAG_LOGE(AAFwkTag::UIABILITY, "get ability object failed"); return nullptr; } @@ -1345,7 +1344,7 @@ napi_value JsUIAbility::CallObjectMethod(const char *name, napi_value const *arg napi_get_named_property(env, obj, name, &methodOnCreate); if (methodOnCreate == nullptr) { if (showMethodNotFoundLog) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get '%{public}s' from Ability object.", name); + TAG_LOGE(AAFwkTag::UIABILITY, "get '%{public}s' from ability object failed", name); } return nullptr; } @@ -1364,7 +1363,7 @@ napi_value JsUIAbility::CallObjectMethod(const char *name, napi_value const *arg if (tryCatch.HasCaught()) { reinterpret_cast(env)->HandleUncaughtException(); } - TAG_LOGI(AAFwkTag::UIABILITY, "Lifecycle: the end of %{public}s, time: %{public}s", + TAG_LOGI(AAFwkTag::UIABILITY, "end, name: %{public}s, time: %{public}s", name, std::to_string(timeEnd - timeStart).c_str()); return nullptr; } @@ -1372,14 +1371,14 @@ napi_value JsUIAbility::CallObjectMethod(const char *name, napi_value const *arg bool JsUIAbility::CheckPromise(napi_value result) { if (result == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "Result is null."); + TAG_LOGE(AAFwkTag::UIABILITY, "null result"); return false; } auto env = jsRuntime_.GetNapiEnv(); bool isPromise = false; napi_is_promise(env, result, &isPromise); if (!isPromise) { - TAG_LOGD(AAFwkTag::UIABILITY, "Result is not promise."); + TAG_LOGD(AAFwkTag::UIABILITY, "result is not promise"); return false; } return true; @@ -1389,19 +1388,19 @@ bool JsUIAbility::CallPromise(napi_value result, AppExecFwk::AbilityTransactionC { auto env = jsRuntime_.GetNapiEnv(); if (!CheckTypeForNapiValue(env, result, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to convert native value to NativeObject."); + TAG_LOGE(AAFwkTag::UIABILITY, "convert native value to NativeObject failed"); return false; } napi_value then = nullptr; napi_get_named_property(env, result, "then", &then); if (then == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get property: then."); + TAG_LOGE(AAFwkTag::UIABILITY, "get property: then failed"); return false; } bool isCallable = false; napi_is_callable(env, then, &isCallable); if (!isCallable) { - TAG_LOGE(AAFwkTag::UIABILITY, "Property then is not callable."); + TAG_LOGE(AAFwkTag::UIABILITY, "property then is not callable"); return false; } HandleScope handleScope(jsRuntime_); @@ -1410,7 +1409,7 @@ bool JsUIAbility::CallPromise(napi_value result, AppExecFwk::AbilityTransactionC callbackInfo, &promiseCallback); napi_value argv[1] = { promiseCallback }; napi_call_function(env, result, then, 1, argv, nullptr); - TAG_LOGD(AAFwkTag::UIABILITY, "CallPromise complete"); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); return true; } @@ -1418,13 +1417,13 @@ bool JsUIAbility::CallPromise(napi_value result, int32_t &onContinueRes) { auto env = jsRuntime_.GetNapiEnv(); if (!CheckTypeForNapiValue(env, result, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Error to convert native value to NativeObject."); + TAG_LOGE(AAFwkTag::UIABILITY, "convert native value to NativeObject error"); return false; } napi_value then = nullptr; napi_get_named_property(env, result, "then", &then); if (then == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Error to get property: then."); + TAG_LOGE(AAFwkTag::UIABILITY, "null then"); return false; } bool isCallable = false; @@ -1438,7 +1437,7 @@ bool JsUIAbility::CallPromise(napi_value result, int32_t &onContinueRes) auto asyncCallback = [abilityWeakPtr = weakPtr, this, &onContinueRes](int32_t &result) { auto ability = abilityWeakPtr.lock(); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } onContinueRes = result; @@ -1454,14 +1453,14 @@ bool JsUIAbility::CallPromise(napi_value result, int32_t &onContinueRes) callbackInfo, &promiseCallback); napi_value argv[1] = { promiseCallback }; napi_call_function(env, result, then, 1, argv, nullptr); - TAG_LOGD(AAFwkTag::UIABILITY, "CallPromise complete"); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); return true; } std::shared_ptr JsUIAbility::CreateADelegatorAbilityProperty() { if (abilityContext_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext_"); return nullptr; } auto property = std::make_shared(); @@ -1495,7 +1494,7 @@ void JsUIAbility::Dump(const std::vector ¶ms, std::vector JsUIAbility::GetJsAbility() { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (jsAbilityObj_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "JsAbility object is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null jsAbilityObj_"); } return jsAbilityObj_; } @@ -1544,7 +1543,7 @@ std::shared_ptr JsUIAbility::GetJsAbility() sptr JsUIAbility::SetNewRuleFlagToCallee(napi_env env, napi_value remoteJsObj) { if (!CheckTypeForNapiValue(env, remoteJsObj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "CalleeObj is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null callee"); return nullptr; } napi_value setFlagMethod = nullptr; @@ -1552,7 +1551,7 @@ sptr JsUIAbility::SetNewRuleFlagToCallee(napi_env env, napi_value bool isCallable = false; napi_is_callable(env, setFlagMethod, &isCallable); if (!isCallable) { - TAG_LOGE(AAFwkTag::UIABILITY, "SetFlagMethod is %{public}s", setFlagMethod == nullptr ? "nullptr" : "not func"); + TAG_LOGE(AAFwkTag::UIABILITY, "setFlagMethod: %{public}s", setFlagMethod == nullptr ? "nullptr" : "not func"); return nullptr; } auto flag = CreateJsValue(env, IsUseNewStartUpRule()); @@ -1561,7 +1560,7 @@ sptr JsUIAbility::SetNewRuleFlagToCallee(napi_env env, napi_value auto remoteObj = NAPI_ohos_rpc_getNativeRemoteObject(env, remoteJsObj); if (remoteObj == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Obj is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null remoteObj"); return nullptr; } return remoteObj; @@ -1571,21 +1570,21 @@ void JsUIAbility::UpdateJsWindowStage(napi_value windowStage) { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (shellContextRef_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "shellContextRef_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null shellContextRef_"); return; } napi_value contextObj = shellContextRef_->GetNapiValue(); napi_env env = jsRuntime_.GetNapiEnv(); if (!CheckTypeForNapiValue(env, contextObj, napi_object)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed to get context native object."); + TAG_LOGE(AAFwkTag::UIABILITY, "get native context obj failed"); return; } if (windowStage == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "Set context windowStage is undefined."); + TAG_LOGE(AAFwkTag::UIABILITY, "null windowStage"); napi_set_named_property(env, contextObj, "windowStage", CreateJsUndefined(env)); return; } - TAG_LOGD(AAFwkTag::UIABILITY, "Set context windowStage object."); + TAG_LOGD(AAFwkTag::UIABILITY, "set context windowStage"); napi_set_named_property(env, contextObj, "windowStage", windowStage); } #endif @@ -1593,10 +1592,10 @@ bool JsUIAbility::CheckSatisfyTargetAPIVersion(int32_t version) { auto applicationInfo = GetApplicationInfo(); if (!applicationInfo) { - TAG_LOGE(AAFwkTag::UIABILITY, "CheckTargetAPIVersion applicationInfo is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null targetAPIVersion"); return false; } - TAG_LOGD(AAFwkTag::UIABILITY, "TargetAPIVersion: %{public}d.", applicationInfo->apiTargetVersion); + TAG_LOGD(AAFwkTag::UIABILITY, "targetAPIVersion: %{public}d", applicationInfo->apiTargetVersion); return applicationInfo->apiTargetVersion % API_VERSION_MOD >= version; } diff --git a/frameworks/native/ability/native/ability_runtime/js_uiservice_ability_connection.cpp b/frameworks/native/ability/native/ability_runtime/js_uiservice_ability_connection.cpp index b7631dd5313..b81852a8263 100644 --- a/frameworks/native/ability/native/ability_runtime/js_uiservice_ability_connection.cpp +++ b/frameworks/native/ability/native/ability_runtime/js_uiservice_ability_connection.cpp @@ -40,23 +40,23 @@ void RemoveUIServiceAbilityConnection(int64_t connectId) return connectId == obj.first.id; }); if (item != g_uiServiceExtensionConnects.end()) { - TAG_LOGD(AAFwkTag::CONTEXT, "exist, remove"); + TAG_LOGD(AAFwkTag::UI_EXT, "exist, remove"); if (item->second) { item->second->RemoveConnectionObject(); item->second->SetProxyObject(nullptr); } g_uiServiceExtensionConnects.erase(item); } else { - TAG_LOGD(AAFwkTag::CONTEXT, "not exist"); + TAG_LOGD(AAFwkTag::UI_EXT, "not exist"); } - TAG_LOGI(AAFwkTag::CONTEXT, "Connects new size:%{public}zu", g_uiServiceExtensionConnects.size()); + TAG_LOGI(AAFwkTag::UI_EXT, "connects new size:%{public}zu", g_uiServiceExtensionConnects.size()); } int64_t InsertUIServiceAbilityConnection(sptr connection, const AAFwk::Want &want) { std::lock_guard lock(g_uiServiceExtensionConnectsLock_); if (connection == nullptr) { - TAG_LOGE(AAFwkTag::CONTEXT, "connection null"); + TAG_LOGE(AAFwkTag::UI_EXT, "connection null"); return -1; } int64_t connectId = g_uiServiceExtensionSerialNumber; diff --git a/frameworks/native/ability/native/auto_fill_extension_ability/js_fill_request_callback.cpp b/frameworks/native/ability/native/auto_fill_extension_ability/js_fill_request_callback.cpp index 20504aadf3f..a9b85aaf2ee 100644 --- a/frameworks/native/ability/native/auto_fill_extension_ability/js_fill_request_callback.cpp +++ b/frameworks/native/ability/native/auto_fill_extension_ability/js_fill_request_callback.cpp @@ -149,7 +149,7 @@ napi_value JsFillRequestCallback::OnFillRequestAutoFillPopupConfig(napi_env env, TAG_LOGD(AAFwkTag::AUTOFILL_EXT, "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::AUTOFILL_EXT, "application is not system-app, can not use system-api"); ThrowError(env, AbilityErrorCode::ERROR_CODE_NOT_SYSTEM_APP); return CreateJsUndefined(env); } diff --git a/frameworks/native/ability/native/ui_ability.cpp b/frameworks/native/ability/native/ui_ability.cpp index 804a2274e2c..243f90db373 100644 --- a/frameworks/native/ability/native/ui_ability.cpp +++ b/frameworks/native/ability/native/ui_ability.cpp @@ -76,9 +76,9 @@ void UIAbility::Init(std::shared_ptr record, std::shared_ptr &handler, const sptr &token) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (record == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityLocalRecord is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null localRecord"); return; } application_ = application; @@ -97,20 +97,20 @@ void UIAbility::Init(std::shared_ptr record, sptr primary = new (std::nothrow) AppExecFwk::ReverseContinuationSchedulerPrimaryStage(continuationHandler, handler_); if (primary == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Primary is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null primary"); } else { continuationHandler_->SetPrimaryStub(primary); continuationHandler_->SetAbilityInfo(abilityInfo_); } } // register displayid change callback - TAG_LOGD(AAFwkTag::UIABILITY, "Call RegisterDisplayListener."); + TAG_LOGD(AAFwkTag::UIABILITY, "registerDisplayListener"); abilityDisplayListener_ = new (std::nothrow) UIAbilityDisplayListener(weak_from_this()); if (abilityDisplayListener_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityDisplayListener_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityDisplayListener_"); return; } - TAG_LOGI(AAFwkTag::UIABILITY, "RegisterDisplayInfoChangedListener."); + TAG_LOGD(AAFwkTag::UIABILITY, "end register"); Rosen::WindowManager::GetInstance().RegisterDisplayInfoChangedListener(token_, abilityDisplayListener_); #endif lifecycle_ = std::make_shared(); @@ -119,7 +119,7 @@ void UIAbility::Init(std::shared_ptr record, if (abilityContext_ != nullptr) { abilityContext_->RegisterAbilityCallback(weak_from_this()); } - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } std::shared_ptr UIAbility::GetLifecycle() @@ -132,11 +132,11 @@ void UIAbility::RegisterAbilityLifecycleObserver(const std::shared_ptrAddObserver(observer); @@ -146,11 +146,11 @@ void UIAbility::UnregisterAbilityLifecycleObserver(const std::shared_ptrRemoveObserver(observer); @@ -165,7 +165,7 @@ void UIAbility::OnStart(const AAFwk::Want &want, sptr sessio { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (abilityInfo_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityInfo_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo_"); return; } @@ -174,7 +174,7 @@ void UIAbility::OnStart(const AAFwk::Want &want, sptr sessio (const_cast(want)).RemoveParam(DLP_PARAMS_SECURITY_FLAG); #endif // WITH_DLP SetWant(want); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability is %{public}s.", abilityInfo_->name.c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", abilityInfo_->name.c_str()); #ifdef SUPPORT_SCREEN if (sessionInfo != nullptr) { SetSessionToken(sessionInfo->sessionToken); @@ -183,30 +183,30 @@ void UIAbility::OnStart(const AAFwk::Want &want, sptr sessio OnStartForSupportGraphics(want); #endif if (abilityLifecycleExecutor_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityLifecycleExecutor_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityLifecycleExecutor_"); return; } abilityLifecycleExecutor_->DispatchLifecycleState( AppExecFwk::AbilityLifecycleExecutor::LifecycleState::STARTED_NEW); if (lifecycle_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "lifecycle_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null lifecycle_"); return; } lifecycle_->DispatchLifecycle(AppExecFwk::LifeCycle::Event::ON_START, want); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbility::OnStop() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); #ifdef SUPPORT_SCREEN - TAG_LOGI(AAFwkTag::UIABILITY, "UnregisterDisplayInfoChangedListener."); + TAG_LOGD(AAFwkTag::UIABILITY, "unregisterDisplayInfoChangedListener"); (void)Rosen::WindowManager::GetInstance().UnregisterDisplayInfoChangedListener(token_, abilityDisplayListener_); auto &&window = GetWindow(); if (window != nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "Call UnregisterDisplayMoveListener."); + TAG_LOGD(AAFwkTag::UIABILITY, "UnregisterDisplayMoveListener"); window->UnregisterDisplayMoveListener(abilityDisplayMoveListener_); } // Call JS Func(onWindowStageDestroy) and Release the scene. @@ -217,17 +217,17 @@ void UIAbility::OnStop() } #endif if (abilityLifecycleExecutor_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityLifecycleExecutor_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityLifecycleExecutor_"); return; } abilityLifecycleExecutor_->DispatchLifecycleState(AppExecFwk::AbilityLifecycleExecutor::LifecycleState::INITIAL); if (lifecycle_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "lifecycle_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null lifecycle_"); return; } lifecycle_->DispatchLifecycle(AppExecFwk::LifeCycle::Event::ON_STOP); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbility::OnStop(AppExecFwk::AbilityTransactionCallbackInfo<> *callbackInfo, bool &isAsyncCallback) @@ -249,38 +249,37 @@ void UIAbility::DestroyInstance() bool UIAbility::IsRestoredInContinuation() const { if (abilityContext_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext_ is null."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext_"); return false; } if (launchParam_.launchReason != AAFwk::LaunchReason::LAUNCHREASON_CONTINUATION) { - TAG_LOGD(AAFwkTag::UIABILITY, "LaunchReason is %{public}d.", launchParam_.launchReason); + TAG_LOGD(AAFwkTag::UIABILITY, "launchReason: %{public}d", launchParam_.launchReason); return false; } - TAG_LOGD(AAFwkTag::UIABILITY, "End."); return true; } bool UIAbility::ShouldRecoverState(const AAFwk::Want &want) { if (!want.GetBoolParam(Want::PARAM_ABILITY_RECOVERY_RESTART, false)) { - TAG_LOGE(AAFwkTag::UIABILITY, "AppRecovery not recovery restart."); + TAG_LOGE(AAFwkTag::UIABILITY, "appRecovery not recovery restart"); return false; } if (abilityRecovery_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityRecovery_ is null."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityRecovery_"); return false; } if (abilityContext_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext_ is null."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext_"); return false; } if (abilityContext_->GetContentStorage() == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get content failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get content failed"); return false; } return true; @@ -305,7 +304,7 @@ void UIAbility::NotifyContinuationResult(const AAFwk::Want &want, bool success) std::string originDeviceId = want.GetStringParam(DMS_ORIGIN_DEVICE_ID); if (continuationManager_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "continuationManager_ is null."); + TAG_LOGE(AAFwkTag::UIABILITY, "null continuationManager_"); return; } continuationManager_->NotifyCompleteContinuation( @@ -325,7 +324,7 @@ void UIAbility::OnConfigurationUpdatedNotify(const AppExecFwk::Configuration &co } // Notify Ability Subclass OnConfigurationUpdated(configuration); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbility::InitConfigurationProperties(const AppExecFwk::Configuration &changeConfiguration, @@ -345,7 +344,7 @@ void UIAbility::InitConfigurationProperties(const AppExecFwk::Configuration &cha resourceConfig.SetHasPointerDevice(changeConfiguration.GetItem(displayId, AAFwk::GlobalConfigurationKey::INPUT_POINTER_DEVICE)); TAG_LOGD(AAFwkTag::UIABILITY, "displayId: [%{public}d], language: [%{public}s], colormode: [%{public}s], " - "hasPointerDevice: [%{public}s] mcc: [%{public}s], mnc: [%{public}s].", displayId, + "hasPointerDevice: [%{public}s] mcc: [%{public}s], mnc: [%{public}s]", displayId, resourceConfig.GetLanguage().c_str(), resourceConfig.GetColormode().c_str(), resourceConfig.GetHasPointerDevice().c_str(), resourceConfig.GetMcc().c_str(), resourceConfig.GetMnc().c_str()); @@ -355,8 +354,8 @@ void UIAbility::InitConfigurationProperties(const AppExecFwk::Configuration &cha resourceConfig.SetHasPointerDevice(changeConfiguration.GetItem( AAFwk::GlobalConfigurationKey::INPUT_POINTER_DEVICE)); TAG_LOGD(AAFwkTag::UIABILITY, - "Language: [%{public}s], colormode: [%{public}s], hasPointerDevice: [%{public}s] " - "mcc: [%{public}s], mnc: [%{public}s].", + "language: [%{public}s], colormode: [%{public}s], hasPointerDevice: [%{public}s] " + "mcc: [%{public}s], mnc: [%{public}s]", resourceConfig.GetLanguage().c_str(), resourceConfig.GetColormode().c_str(), resourceConfig.GetHasPointerDevice().c_str(), resourceConfig.GetMcc().c_str(), resourceConfig.GetMnc().c_str()); @@ -368,7 +367,7 @@ void UIAbility::OnMemoryLevel(int level) TAG_LOGD(AAFwkTag::UIABILITY, "called"); #ifdef SUPPORT_SCREEN if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "WindowScene is null."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene"); return; } scene_->NotifyMemoryLevel(level); @@ -378,7 +377,7 @@ void UIAbility::OnMemoryLevel(int level) std::string UIAbility::GetAbilityName() { if (abilityInfo_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityInfo_ is nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo_"); return ""; } return abilityInfo_->name; @@ -387,7 +386,7 @@ std::string UIAbility::GetAbilityName() std::string UIAbility::GetModuleName() { if (abilityInfo_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityInfo_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo_"); return ""; } @@ -433,7 +432,7 @@ AppExecFwk::AbilityLifecycleExecutor::LifecycleState UIAbility::GetState() { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityLifecycleExecutor_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityLifecycleExecutor_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityLifecycleExecutor_"); return AppExecFwk::AbilityLifecycleExecutor::LifecycleState::UNINITIALIZED; } return static_cast(abilityLifecycleExecutor_->GetState()); @@ -447,12 +446,12 @@ int32_t UIAbility::OnContinue(AAFwk::WantParams &wantParams) void UIAbility::ContinueAbilityWithStack(const std::string &deviceId, uint32_t versionCode) { if (deviceId.empty()) { - TAG_LOGE(AAFwkTag::UIABILITY, "DeviceId is empty."); + TAG_LOGE(AAFwkTag::UIABILITY, "empty deviceId"); return; } if (continuationManager_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "continuationManager_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null continuationManager_"); return; } continuationManager_->ContinueAbilityWithStack(deviceId, versionCode); @@ -482,7 +481,7 @@ void UIAbility::OnCompleteContinuation(int result) { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (continuationManager_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Continuation manager is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null continuationManager_"); return; } @@ -497,14 +496,14 @@ void UIAbility::OnRemoteTerminated() void UIAbility::DispatchLifecycleOnForeground(const AAFwk::Want &want) { if (abilityLifecycleExecutor_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityLifecycleExecutor_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityLifecycleExecutor_"); return; } abilityLifecycleExecutor_->DispatchLifecycleState( AppExecFwk::AbilityLifecycleExecutor::LifecycleState::FOREGROUND_NEW); if (lifecycle_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "lifecycle_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null lifecycle_"); return; } lifecycle_->DispatchLifecycle(AppExecFwk::LifeCycle::Event::ON_FOREGROUND, want); @@ -513,7 +512,7 @@ void UIAbility::DispatchLifecycleOnForeground(const AAFwk::Want &want) void UIAbility::HandleCreateAsRecovery(const AAFwk::Want &want) { if (!want.GetBoolParam(Want::PARAM_ABILITY_RECOVERY_RESTART, false)) { - TAG_LOGE(AAFwkTag::UIABILITY, "AppRecovery not recovery restart."); + TAG_LOGE(AAFwkTag::UIABILITY, "appRecovery not recovery restart"); return; } @@ -604,14 +603,13 @@ void UIAbility::onSceneDestroyed() void UIAbility::OnForeground(const AAFwk::Want &want) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); DoOnForeground(want); if (isSilentForeground_) { TAG_LOGD(AAFwkTag::UIABILITY, "silent foreground, return"); return; } DispatchLifecycleOnForeground(want); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); AAFwk::EventInfo eventInfo; eventInfo.bundleName = want.GetElement().GetBundleName(); eventInfo.moduleName = want.GetElement().GetModuleName(); @@ -620,7 +618,7 @@ void UIAbility::OnForeground(const AAFwk::Want &want) if (abilityInfo_ != nullptr) { eventInfo.bundleType = static_cast(abilityInfo_->applicationInfo.bundleType); } else { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityInfo_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo_"); } AAFwk::EventReport::SendAbilityEvent(AAFwk::EventName::ABILITY_ONFOREGROUND, HiSysEventType::BEHAVIOR, eventInfo); } @@ -628,14 +626,14 @@ void UIAbility::OnForeground(const AAFwk::Want &want) void UIAbility::OnBackground() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityInfo_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityInfo_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo_"); return; } if (scene_ != nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "GoBackground sceneFlag: %{public}d.", sceneFlag_); + TAG_LOGD(AAFwkTag::UIABILITY, "goBackground sceneFlag: %{public}d", sceneFlag_); scene_->GoBackground(sceneFlag_); } @@ -645,18 +643,17 @@ void UIAbility::OnBackground() } if (abilityLifecycleExecutor_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityLifecycleExecutor_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityLifecycleExecutor_"); return; } abilityLifecycleExecutor_->DispatchLifecycleState( AppExecFwk::AbilityLifecycleExecutor::LifecycleState::BACKGROUND_NEW); if (lifecycle_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "lifecycle_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null lifecycle_"); return; } lifecycle_->DispatchLifecycle(AppExecFwk::LifeCycle::Event::ON_BACKGROUND); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); AAFwk::EventInfo eventInfo; eventInfo.bundleName = abilityInfo_->bundleName; eventInfo.moduleName = abilityInfo_->moduleName; @@ -691,7 +688,7 @@ std::string UIAbility::GetContentInfo() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Scene invalid."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene"); return ""; } return scene_->GetContentInfo(Rosen::BackupAndRestoreType::CONTINUATION); @@ -701,7 +698,7 @@ std::string UIAbility::GetContentInfoForRecovery() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Scene invalid."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene"); return ""; } return scene_->GetContentInfo(Rosen::BackupAndRestoreType::APP_RECOVERY); @@ -711,7 +708,7 @@ std::string UIAbility::GetContentInfoForDefaultRecovery() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Scene invalid."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene"); return ""; } return scene_->GetContentInfo(Rosen::BackupAndRestoreType::RESOURCESCHEDULE_RECOVERY); @@ -745,22 +742,22 @@ ErrCode UIAbility::SetMissionLabel(const std::string &label) { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (!abilityInfo_ || abilityInfo_->type != AppExecFwk::AbilityType::PAGE) { - TAG_LOGE(AAFwkTag::UIABILITY, "Invalid ability info."); + TAG_LOGE(AAFwkTag::UIABILITY, "invalid ability info"); return ERR_INVALID_VALUE; } if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Scene is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene"); return ERR_INVALID_VALUE; } auto window = scene_->GetMainWindow(); if (window == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get window scene failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "get window scene failed"); return ERR_INVALID_VALUE; } if (window->SetAPPWindowLabel(label) != OHOS::Rosen::WMError::WM_OK) { - TAG_LOGE(AAFwkTag::UIABILITY, "SetAPPWindowLabel failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "setAPPWindowLabel failed"); return ERR_INVALID_VALUE; } return ERR_OK; @@ -770,22 +767,22 @@ ErrCode UIAbility::SetMissionIcon(const std::shared_ptr & { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (!abilityInfo_ || abilityInfo_->type != AppExecFwk::AbilityType::PAGE) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityInfo_ is nullptr or not page type."); + TAG_LOGE(AAFwkTag::UIABILITY, "abilityInfo_ is nullptr or not page type"); return ERR_INVALID_VALUE; } if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Scene_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene_"); return ERR_INVALID_VALUE; } auto window = scene_->GetMainWindow(); if (window == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Window is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null window"); return ERR_INVALID_VALUE; } if (window->SetAPPWindowIcon(icon) != OHOS::Rosen::WMError::WM_OK) { - TAG_LOGE(AAFwkTag::UIABILITY, "SetAPPWindowIcon failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "setAPPWindowIcon failed"); return ERR_INVALID_VALUE; } return ERR_OK; @@ -795,19 +792,19 @@ void UIAbility::GetWindowRect(int32_t &left, int32_t &top, int32_t &width, int32 { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Scene is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene"); return; } auto window = scene_->GetMainWindow(); if (window == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Window is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null window"); return; } left = window->GetRect().posX_; top = window->GetRect().posY_; width = static_cast(window->GetRect().width_); height = static_cast(window->GetRect().height_); - TAG_LOGD(AAFwkTag::UIABILITY, "left: %{public}d, top: %{public}d, width: %{public}d, height: %{public}d.", + TAG_LOGD(AAFwkTag::UIABILITY, "left: %{public}d, top: %{public}d, width: %{public}d, height: %{public}d", left, top, width, height); } @@ -815,12 +812,12 @@ Ace::UIContent *UIAbility::GetUIContent() { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (scene_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get window scene failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene_"); return nullptr; } auto window = scene_->GetMainWindow(); if (window == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get window failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "null window"); return nullptr; } return window->GetUIContent(); @@ -839,11 +836,11 @@ void UIAbility::OnDestroy(Rosen::DisplayId displayId) void UIAbility::OnDisplayInfoChange(const sptr& token, Rosen::DisplayId displayId, float density, Rosen::DisplayOrientation orientation) { - TAG_LOGI(AAFwkTag::UIABILITY, "Begin displayId: %{public}" PRIu64, displayId); + TAG_LOGD(AAFwkTag::UIABILITY, "displayId: %{public}" PRIu64, displayId); // Get display auto display = Rosen::DisplayManager::GetInstance().GetDisplayById(displayId); if (!display) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get display by displayId %{public}" PRIu64 " failed.", displayId); + TAG_LOGE(AAFwkTag::UIABILITY, "get display by displayId %{public}" PRIu64 " failed", displayId); return; } @@ -858,7 +855,7 @@ void UIAbility::OnDisplayInfoChange(const sptr& token, Rosen::Dis resConfig->SetScreenDensity(density); resConfig->SetDirection(AppExecFwk::ConvertDirection(height, width)); resourceManager->UpdateResConfig(*resConfig); - TAG_LOGD(AAFwkTag::UIABILITY, "Notify ResourceManager, Density: %{public}f, Direction: %{public}d", + TAG_LOGD(AAFwkTag::UIABILITY, "notify resourceManager, density: %{public}f, direction: %{public}d", resConfig->GetScreenDensity(), resConfig->GetDirection()); } } @@ -871,21 +868,21 @@ void UIAbility::OnDisplayInfoChange(const sptr& token, Rosen::Dis displayId, AppExecFwk::ConfigurationInner::APPLICATION_DENSITYDPI, AppExecFwk::GetDensityStr(density)); if (application_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "application_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null application_"); return; } OnChangeForUpdateConfiguration(newConfig); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbility::OnChange(Rosen::DisplayId displayId) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin displayId: %{public}" PRIu64 "", displayId); + TAG_LOGD(AAFwkTag::UIABILITY, "displayId: %{public}" PRIu64 "", displayId); // Get display auto display = Rosen::DisplayManager::GetInstance().GetDisplayById(displayId); if (!display) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get display by displayId %{public}" PRIu64 " failed.", displayId); + TAG_LOGE(AAFwkTag::UIABILITY, "get display by displayId %{public}" PRIu64 " failed", displayId); return; } @@ -901,7 +898,7 @@ void UIAbility::OnChange(Rosen::DisplayId displayId) resConfig->SetScreenDensity(density); resConfig->SetDirection(AppExecFwk::ConvertDirection(height, width)); resourceManager->UpdateResConfig(*resConfig); - TAG_LOGD(AAFwkTag::UIABILITY, "Notify ResourceManager, Density: %{public}f, Direction: %{public}d", + TAG_LOGD(AAFwkTag::UIABILITY, "notify ResourceManager, density: %{public}f, direction: %{public}d", resConfig->GetScreenDensity(), resConfig->GetDirection()); } } @@ -914,20 +911,20 @@ void UIAbility::OnChange(Rosen::DisplayId displayId) displayId, AppExecFwk::ConfigurationInner::APPLICATION_DENSITYDPI, AppExecFwk::GetDensityStr(density)); if (application_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "application_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null application_"); return; } OnChangeForUpdateConfiguration(newConfig); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbility::OnDisplayMove(Rosen::DisplayId from, Rosen::DisplayId to) { - TAG_LOGD(AAFwkTag::UIABILITY, "From displayId %{public}" PRIu64 " to %{public}" PRIu64 "", from, to); + TAG_LOGD(AAFwkTag::UIABILITY, "from displayId %{public}" PRIu64 " to %{public}" PRIu64 "", from, to); auto display = Rosen::DisplayManager::GetInstance().GetDisplayById(to); if (!display) { - TAG_LOGE(AAFwkTag::UIABILITY, "Get display by displayId %{public}" PRIu64 " failed.", to); + TAG_LOGE(AAFwkTag::UIABILITY, "get display by displayId %{public}" PRIu64 " failed", to); return; } // Get new display config @@ -943,7 +940,7 @@ void UIAbility::OnDisplayMove(Rosen::DisplayId from, Rosen::DisplayId to) resConfig->SetDirection(AppExecFwk::ConvertDirection(height, width)); resourceManager->UpdateResConfig(*resConfig); TAG_LOGD(AAFwkTag::UIABILITY, - "Density: %{public}f, Direction: %{public}d", resConfig->GetScreenDensity(), resConfig->GetDirection()); + "Density: %{public}f, direction: %{public}d", resConfig->GetScreenDensity(), resConfig->GetDirection()); } } UpdateConfiguration(to, density, width, height); @@ -957,24 +954,24 @@ void UIAbility::UpdateConfiguration(Rosen::DisplayId to, float density, int32_t to, AppExecFwk::ConfigurationInner::APPLICATION_DIRECTION, AppExecFwk::GetDirectionStr(height, width)); newConfig.AddItem(to, AppExecFwk::ConfigurationInner::APPLICATION_DENSITYDPI, AppExecFwk::GetDensityStr(density)); if (application_ == nullptr || handler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "application_ or handler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null application_ or handler_"); return; } std::vector changeKeyV; auto configuration = application_->GetConfiguration(); if (!configuration) { - TAG_LOGE(AAFwkTag::UIABILITY, "Configuration is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null configuration"); return; } configuration->CompareDifferent(changeKeyV, newConfig); - TAG_LOGD(AAFwkTag::UIABILITY, "changeKeyV size: %{public}zu.", changeKeyV.size()); + TAG_LOGD(AAFwkTag::UIABILITY, "changeKeyV size: %{public}zu", changeKeyV.size()); if (!changeKeyV.empty()) { configuration->Merge(changeKeyV, newConfig); auto task = [abilityWptr = weak_from_this(), configuration = *configuration]() { auto ability = abilityWptr.lock(); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->OnConfigurationUpdated(configuration); @@ -997,12 +994,12 @@ sptr UIAbility::GetWindowOption(const AAFwk::Want &want) { auto option = sptr::MakeSptr(); if (option == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Option is null."); + TAG_LOGE(AAFwkTag::UIABILITY, "null option"); return nullptr; } auto windowMode = want.GetIntParam( AAFwk::Want::PARAM_RESV_WINDOW_MODE, AAFwk::AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_UNDEFINED); - TAG_LOGD(AAFwkTag::UIABILITY, "Window mode is %{public}d.", windowMode); + TAG_LOGD(AAFwkTag::UIABILITY, "window mode: %{public}d", windowMode); option->SetWindowMode(static_cast(windowMode)); bool showOnLockScreen = false; if (abilityInfo_) { @@ -1014,13 +1011,13 @@ sptr UIAbility::GetWindowOption(const AAFwk::Want &want) } } if (showOnLockScreen_ || showOnLockScreen) { - TAG_LOGD(AAFwkTag::UIABILITY, "Add window flag WINDOW_FLAG_SHOW_WHEN_LOCKED."); + TAG_LOGD(AAFwkTag::UIABILITY, "add window flag WINDOW_FLAG_SHOW_WHEN_LOCKED"); option->AddWindowFlag(Rosen::WindowFlag::WINDOW_FLAG_SHOW_WHEN_LOCKED); } if (want.GetElement().GetBundleName() == LAUNCHER_BUNDLE_NAME && want.GetElement().GetAbilityName() == LAUNCHER_ABILITY_NAME) { - TAG_LOGD(AAFwkTag::UIABILITY, "Set window type for launcher."); + TAG_LOGD(AAFwkTag::UIABILITY, "set window type for launcher"); option->SetWindowType(Rosen::WindowType::WINDOW_TYPE_DESKTOP); } return option; @@ -1036,13 +1033,13 @@ void UIAbility::OnStartForSupportGraphics(const AAFwk::Want &want) if (abilityInfo_->type == AppExecFwk::AbilityType::PAGE) { int32_t defualtDisplayId = static_cast(Rosen::DisplayManager::GetInstance().GetDefaultDisplayId()); int32_t displayId = want.GetIntParam(AAFwk::Want::PARAM_RESV_DISPLAY_ID, defualtDisplayId); - TAG_LOGD(AAFwkTag::UIABILITY, "abilityName: %{public}s, displayId: %{public}d.", + TAG_LOGD(AAFwkTag::UIABILITY, "abilityName: %{public}s, displayId: %{public}d", abilityInfo_->name.c_str(), displayId); auto option = GetWindowOption(want); InitWindow(displayId, option); // Update resMgr, Configuration - TAG_LOGD(AAFwkTag::UIABILITY, "DisplayId is %{public}d.", displayId); + TAG_LOGD(AAFwkTag::UIABILITY, "displayId: %{public}d", displayId); auto display = Rosen::DisplayManager::GetInstance().GetDisplayById(displayId); if (display) { float density = display->GetVirtualPixelRatio(); @@ -1064,7 +1061,7 @@ void UIAbility::OnStartForSupportGraphics(const AAFwk::Want &want) std::unique_ptr resConfig(Global::Resource::CreateResConfig()); if (resConfig == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ResConfig is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null resConfig"); return; } auto resourceManager = GetResourceManager(); @@ -1073,7 +1070,7 @@ void UIAbility::OnStartForSupportGraphics(const AAFwk::Want &want) resConfig->SetScreenDensity(density); resConfig->SetDirection(AppExecFwk::ConvertDirection(height, width)); resourceManager->UpdateResConfig(*resConfig); - TAG_LOGD(AAFwkTag::UIABILITY, "Density: %{public}f, Direction: %{public}d", + TAG_LOGD(AAFwkTag::UIABILITY, "density: %{public}f, direction: %{public}d", resConfig->GetScreenDensity(), resConfig->GetDirection()); } } @@ -1083,24 +1080,24 @@ void UIAbility::OnStartForSupportGraphics(const AAFwk::Want &want) void UIAbility::OnChangeForUpdateConfiguration(const AppExecFwk::Configuration &newConfig) { if (application_ == nullptr || handler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "application_ or handler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null application_ or handler_"); return; } auto configuration = application_->GetConfiguration(); if (!configuration) { - TAG_LOGE(AAFwkTag::UIABILITY, "Configuration is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null configuration"); return; } std::vector changeKeyV; configuration->CompareDifferent(changeKeyV, newConfig); - TAG_LOGD(AAFwkTag::UIABILITY, "ChangeKeyV size: %{public}zu.", changeKeyV.size()); + TAG_LOGD(AAFwkTag::UIABILITY, "changeKeyV size: %{public}zu", changeKeyV.size()); if (!changeKeyV.empty()) { configuration->Merge(changeKeyV, newConfig); auto task = [abilityWptr = weak_from_this(), configuration = *configuration]() { auto ability = abilityWptr.lock(); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->OnConfigurationUpdated(configuration); @@ -1140,7 +1137,7 @@ int UIAbility::CreateModalUIExtension(const AAFwk::Want &want) TAG_LOGD(AAFwkTag::UIABILITY, "call"); auto abilityContextImpl = GetAbilityContext(); if (abilityContextImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext is nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext"); return ERR_INVALID_VALUE; } return abilityContextImpl->CreateModalUIExtensionWithApp(want); @@ -1152,7 +1149,7 @@ void UIAbility::SetSessionToken(sptr sessionToken) sessionToken_ = sessionToken; auto abilityContextImpl = GetAbilityContext(); if (abilityContextImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext is nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext"); return; } abilityContextImpl->SetWeakSessionToken(sessionToken); @@ -1168,7 +1165,7 @@ void UIAbility::EraseUIExtension(int32_t sessionId) TAG_LOGD(AAFwkTag::UIABILITY, "call"); auto abilityContextImpl = GetAbilityContext(); if (abilityContextImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext is nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext"); return; } abilityContextImpl->EraseUIExtension(sessionId); @@ -1187,7 +1184,7 @@ std::string UIAbility::GetIdentityToken() const bool UIAbility::CheckRecoveryEnabled() { if (useAppSettedRecoveryValue_.load()) { - TAG_LOGD(AAFwkTag::UIABILITY, "Use app setted value."); + TAG_LOGD(AAFwkTag::UIABILITY, "use app setted value"); // Check in app recovery, here return true. return true; } @@ -1198,13 +1195,13 @@ bool UIAbility::CheckRecoveryEnabled() bool UIAbility::CheckDefaultRecoveryEnabled() { if (setting_ == nullptr) { - TAG_LOGW(AAFwkTag::UIABILITY, "setting is nullptr."); + TAG_LOGW(AAFwkTag::UIABILITY, "null setting_"); return false; } auto value = setting_->GetProperty(AppExecFwk::AbilityStartSetting::DEFAULT_RECOVERY_KEY); if ((!useAppSettedRecoveryValue_.load()) && (value == "true")) { - TAG_LOGD(AAFwkTag::UIABILITY, "default recovery enabled."); + TAG_LOGD(AAFwkTag::UIABILITY, "default recovery enabled"); return true; } @@ -1214,13 +1211,13 @@ bool UIAbility::CheckDefaultRecoveryEnabled() bool UIAbility::IsStartByScb() { if (setting_ == nullptr) { - TAG_LOGW(AAFwkTag::UIABILITY, "setting is nullptr."); + TAG_LOGW(AAFwkTag::UIABILITY, "null setting_"); return false; } auto value = setting_->GetProperty(AppExecFwk::AbilityStartSetting::IS_START_BY_SCB_KEY); if (value == "true") { - TAG_LOGD(AAFwkTag::UIABILITY, "Start by scb."); + TAG_LOGD(AAFwkTag::UIABILITY, "start by scb"); return true; } diff --git a/frameworks/native/ability/native/ui_ability_impl.cpp b/frameworks/native/ability/native/ui_ability_impl.cpp index c45bd9435b1..b740e734274 100644 --- a/frameworks/native/ability/native/ui_ability_impl.cpp +++ b/frameworks/native/ability/native/ui_ability_impl.cpp @@ -36,10 +36,10 @@ void UIAbilityImpl::Init(const std::shared_ptr &app std::shared_ptr &handler, const sptr &token) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (token == nullptr || application == nullptr || handler == nullptr || record == nullptr || ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Token or application or handler or record is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null token or application or handler or record"); return; } token_ = record->GetToken(); @@ -52,15 +52,15 @@ void UIAbilityImpl::Init(const std::shared_ptr &app ability_->Init(record, application, handler, token); lifecycleState_ = AAFwk::ABILITY_STATE_INITIAL; abilityLifecycleCallbacks_ = application; - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::Start(const AAFwk::Want &want, sptr sessionInfo) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr || ability_->GetAbilityInfo() == nullptr || abilityLifecycleCallbacks_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ or abilityLifecycleCallbacks_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_ or abilityLifecycleCallbacks_"); return; } #ifdef SUPPORT_GRAPHICS @@ -74,27 +74,27 @@ void UIAbilityImpl::Start(const AAFwk::Want &want, sptr sess lifecycleState_ = AAFwk::ABILITY_STATE_INACTIVE; #endif abilityLifecycleCallbacks_->OnAbilityStart(ability_); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::Stop() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } ability_->OnStop(); StopCallback(); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::Stop(bool &isAsyncCallback) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); isAsyncCallback = false; return; } @@ -110,7 +110,7 @@ void UIAbilityImpl::Stop(bool &isAsyncCallback) auto asyncCallback = [abilityImplWeakPtr = weakPtr, state = AAFwk::ABILITY_STATE_INITIAL]() { auto abilityImpl = abilityImplWeakPtr.lock(); if (abilityImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl"); return; } abilityImpl->StopCallback(); @@ -123,13 +123,13 @@ void UIAbilityImpl::Stop(bool &isAsyncCallback) AppExecFwk::AbilityTransactionCallbackInfo<>::Destroy(callbackInfo); } // else: callbackInfo will be destroyed after the async callback - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::StopCallback() { if (ability_ == nullptr || abilityLifecycleCallbacks_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ or abilityLifecycleCallbacks_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_ or abilityLifecycleCallbacks_"); return; } #ifdef SUPPORT_GRAPHICS @@ -143,9 +143,9 @@ void UIAbilityImpl::StopCallback() int32_t UIAbilityImpl::Share(AAFwk::WantParams &wantParam) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return ERR_INVALID_VALUE; } return ability_->OnShare(wantParam); @@ -169,7 +169,7 @@ void UIAbilityImpl::HandleAbilityTransaction( { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); TAG_LOGD(AAFwkTag::UIABILITY, - "Lifecycle: srcState:%{public}d; targetState: %{public}d; isNewWant: %{public}d, sceneFlag: %{public}d", + "srcState:%{public}d; targetState: %{public}d; isNewWant: %{public}d, sceneFlag: %{public}d", lifecycleState_, targetState.state, targetState.isNewWant, targetState.sceneFlag); UpdateSilentForeground(targetState, sessionInfo); #ifdef SUPPORT_SCREEN @@ -182,7 +182,7 @@ void UIAbilityImpl::HandleAbilityTransaction( AAFwk::AbilityManagerClient::GetInstance()->AbilityTransitionDone( token_, targetState.state, GetRestoreData()); } - TAG_LOGE(AAFwkTag::UIABILITY, "Org lifeCycleState equals to Dst lifeCycleState."); + TAG_LOGE(AAFwkTag::UIABILITY, "Org lifeCycleState equals to dst lifeCycleState"); return; } #endif @@ -205,16 +205,16 @@ void UIAbilityImpl::HandleAbilityTransaction( void UIAbilityImpl::HandleShareData(int32_t uniqueId) { - TAG_LOGD(AAFwkTag::UIABILITY, "Called sourceState: %{public}d.", lifecycleState_); + TAG_LOGD(AAFwkTag::UIABILITY, "sourceState: %{public}d", lifecycleState_); WantParams wantParam; int32_t resultCode = Share(wantParam); - TAG_LOGD(AAFwkTag::UIABILITY, "WantParam size: %{public}d.", wantParam.Size()); + TAG_LOGD(AAFwkTag::UIABILITY, "wantParam size: %{public}d", wantParam.Size()); AAFwk::AbilityManagerClient::GetInstance()->ShareDataDone(token_, resultCode, uniqueId, wantParam); } void UIAbilityImpl::AbilityTransactionCallback(const AAFwk::AbilityLifeCycleState &state) { - TAG_LOGD(AAFwkTag::UIABILITY, "Lifecycle: notify ability manager service."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); FreezeUtil::LifecycleFlow flow = { token_, FreezeUtil::TimeoutState::FOREGROUND }; std::string entry = std::to_string(TimeUtil::SystemTimeMillisecond()) + "; AbilityManagerClient::AbilityTransitionDone; the transaction start."; @@ -230,42 +230,42 @@ void UIAbilityImpl::AbilityTransactionCallback(const AAFwk::AbilityLifeCycleStat void UIAbilityImpl::ExecuteInsightIntentDone(uint64_t intentId, const InsightIntentExecuteResult &result) { - TAG_LOGI(AAFwkTag::UIABILITY, "Notify execute done, intentId %{public}" PRIu64"", intentId); + TAG_LOGI(AAFwkTag::UIABILITY, "intentId %{public}" PRIu64"", intentId); auto ret = AAFwk::AbilityManagerClient::GetInstance()->ExecuteInsightIntentDone(token_, intentId, result); if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::UIABILITY, "Notify execute done faild."); + TAG_LOGE(AAFwkTag::UIABILITY, "notify execute done faild"); } } #ifdef SUPPORT_SCREEN bool UIAbilityImpl::PrepareTerminateAbility() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return false; } bool ret = ability_->OnPrepareTerminate(); - TAG_LOGD(AAFwkTag::UIABILITY, "End ret is %{public}d.", ret); + TAG_LOGD(AAFwkTag::UIABILITY, "end ret: %{public}d", ret); return ret; } #endif void UIAbilityImpl::SendResult(int requestCode, int resultCode, const AAFwk::Want &resultData) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } ability_->OnAbilityResult(requestCode, resultCode, resultData); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::NewWant(const AAFwk::Want &want) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } ability_->SetWant(want); @@ -273,13 +273,13 @@ void UIAbilityImpl::NewWant(const AAFwk::Want &want) #ifdef SUPPORT_SCREEN ability_->ContinuationRestore(want); #endif - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::SetLifeCycleStateInfo(const AAFwk::LifeCycleStateInfo &info) { if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } ability_->SetLifeCycleStateInfo(info); @@ -287,18 +287,18 @@ void UIAbilityImpl::SetLifeCycleStateInfo(const AAFwk::LifeCycleStateInfo &info) bool UIAbilityImpl::CheckAndRestore() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (!hasSaveData_) { - TAG_LOGE(AAFwkTag::UIABILITY, "hasSaveData_ is false."); + TAG_LOGE(AAFwkTag::UIABILITY, "hasSaveData_: false"); return false; } if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return false; } ability_->OnRestoreAbilityState(restoreData_); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); return true; } @@ -317,22 +317,20 @@ void UIAbilityImpl::SetCallingContext(const std::string &deviceId, const std::st void UIAbilityImpl::ScheduleUpdateConfiguration(const AppExecFwk::Configuration &config) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } - TAG_LOGD(AAFwkTag::UIABILITY, "Ability name: [%{public}s].", ability_->GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability name: [%{public}s]", ability_->GetAbilityName().c_str()); ability_->OnConfigurationUpdatedNotify(config); - - TAG_LOGD(AAFwkTag::UIABILITY, "End."); } void UIAbilityImpl::ContinueAbility(const std::string &deviceId, uint32_t versionCode) { if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } ability_->ContinueAbilityWithStack(deviceId, versionCode); @@ -341,7 +339,7 @@ void UIAbilityImpl::ContinueAbility(const std::string &deviceId, uint32_t versio void UIAbilityImpl::NotifyContinuationResult(int32_t result) { if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } ability_->OnCompleteContinuation(result); @@ -350,7 +348,7 @@ void UIAbilityImpl::NotifyContinuationResult(int32_t result) void UIAbilityImpl::NotifyMemoryLevel(int32_t level) { if (ability_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } ability_->OnMemoryLevel(level); @@ -360,7 +358,7 @@ void UIAbilityImpl::UpdateSilentForeground(const AAFwk::LifeCycleStateInfo &targ sptr sessionInfo) { if (ability_ == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "ability_ is null"); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_"); return; } if (ability_->CheckIsSilentForeground() && targetState.state == AAFwk::ABILITY_STATE_FOREGROUND_NEW) { @@ -370,7 +368,7 @@ void UIAbilityImpl::UpdateSilentForeground(const AAFwk::LifeCycleStateInfo &targ sessionInfo && sessionInfo->processOptions && AAFwk::ProcessOptions::IsValidProcessMode(sessionInfo->processOptions->processMode) && sessionInfo->processOptions->startupVisibility == AAFwk::StartupVisibility::STARTUP_HIDE) { - TAG_LOGI(AAFwkTag::UIABILITY, "Set IsSilentForeground to true."); + TAG_LOGI(AAFwkTag::UIABILITY, "set IsSilentForeground to true"); ability_->SetIsSilentForeground(true); return; } @@ -393,23 +391,23 @@ void UIAbilityImpl::AfterFocusedCommon(bool isFocused) auto task = [abilityImpl = weak_from_this(), focuseMode = isFocused]() { auto impl = abilityImpl.lock(); if (impl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "impl is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null impl"); return; } if (!impl->ability_ || !impl->ability_->GetAbilityInfo()) { - TAG_LOGE(AAFwkTag::UIABILITY, "%{public}s failed.", focuseMode ? "AfterFocused" : "AfterUnFocused"); + TAG_LOGE(AAFwkTag::UIABILITY, "%{public}s failed", focuseMode ? "AfterFocused" : "AfterUnFocused"); return; } auto abilityContext = impl->ability_->GetAbilityContext(); if (abilityContext == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContext is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContext"); return; } auto applicationContext = abilityContext->GetApplicationContext(); if (applicationContext == nullptr || applicationContext->IsAbilityLifecycleCallbackEmpty()) { - TAG_LOGE(AAFwkTag::UIABILITY, "applicationContext or lifecycleCallback is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null applicationContext or lifecycleCallback"); return; } auto &jsAbility = static_cast(*(impl->ability_)); @@ -423,16 +421,16 @@ void UIAbilityImpl::AfterFocusedCommon(bool isFocused) if (handler_) { handler_->PostTask(task); } - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::WindowLifeCycleImpl::AfterForeground() { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Lifecycle: Call."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); auto owner = owner_.lock(); if (owner == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Owner is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null owner"); return; } FreezeUtil::LifecycleFlow flow = { token_, FreezeUtil::TimeoutState::FOREGROUND }; @@ -447,15 +445,15 @@ void UIAbilityImpl::WindowLifeCycleImpl::AfterForeground() owner->notifyForegroundByAbility_ = false; needNotifyAMS = true; } else { - TAG_LOGD(AAFwkTag::UIABILITY, "Notify foreground by window, but client's foreground is running."); + TAG_LOGD(AAFwkTag::UIABILITY, "notify foreground by window, but client's foreground is running"); owner->notifyForegroundByWindow_ = true; } } if (needNotifyAMS) { - TAG_LOGI(AAFwkTag::UIABILITY, "Lifecycle: window notify ability manager service."); + TAG_LOGI(AAFwkTag::UIABILITY, "notify ability manager service"); entry = std::to_string(TimeUtil::SystemTimeMillisecond()) + - "; AbilityManagerClient::AbilityTransitionDone; the transaction start."; + "; AbilityManagerClient::AbilityTransitionDone; the transaction start"; FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); owner->lifecycleState_ = AAFwk::ABILITY_STATE_BACKGROUND_NEW; AppExecFwk::PacMap restoreData; @@ -476,7 +474,6 @@ void UIAbilityImpl::WindowLifeCycleImpl::AfterBackground() "; UIAbilityImpl::WindowLifeCycleImpl::AfterBackground; the background lifecycle."; FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); - TAG_LOGD(AAFwkTag::UIABILITY, "Lifecycle: window after background."); AppExecFwk::PacMap restoreData; auto ret = AAFwk::AbilityManagerClient::GetInstance()->AbilityTransitionDone( token_, AAFwk::AbilityLifeCycleState::ABILITY_STATE_BACKGROUND_NEW, restoreData); @@ -487,37 +484,37 @@ void UIAbilityImpl::WindowLifeCycleImpl::AfterBackground() void UIAbilityImpl::WindowLifeCycleImpl::AfterFocused() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); auto owner = owner_.lock(); if (owner) { owner->AfterFocused(); } - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::WindowLifeCycleImpl::AfterUnfocused() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); auto owner = owner_.lock(); if (owner) { owner->AfterUnFocused(); } - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::WindowLifeCycleImpl::ForegroundFailed(int32_t type) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); AppExecFwk::PacMap restoreData; switch (type) { case static_cast(OHOS::Rosen::WMError::WM_ERROR_INVALID_OPERATION): { - TAG_LOGD(AAFwkTag::UIABILITY, "Window was freezed."); + TAG_LOGD(AAFwkTag::UIABILITY, "window is freezed"); AAFwk::AbilityManagerClient::GetInstance()->AbilityTransitionDone( token_, AAFwk::AbilityLifeCycleState::ABILITY_STATE_WINDOW_FREEZED, restoreData); break; } case static_cast(OHOS::Rosen::WMError::WM_ERROR_INVALID_WINDOW_MODE_OR_SIZE): { - TAG_LOGD(AAFwkTag::UIABILITY, "The ability is stage mode, schedule foreground invalid mode."); + TAG_LOGD(AAFwkTag::UIABILITY, "invalid stage mode"); AAFwk::AbilityManagerClient::GetInstance()->AbilityTransitionDone( token_, AAFwk::AbilityLifeCycleState::ABILITY_STATE_INVALID_WINDOW_MODE, restoreData); break; @@ -538,16 +535,15 @@ void UIAbilityImpl::WindowLifeCycleImpl::ForegroundFailed(int32_t type) void UIAbilityImpl::Foreground(const AAFwk::Want &want) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr || ability_->GetAbilityInfo() == nullptr || abilityLifecycleCallbacks_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ or abilityLifecycleCallbacks_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_ or abilityLifecycleCallbacks_"); return; } - TAG_LOGD(AAFwkTag::UIABILITY, "Call onForeground."); ability_->OnForeground(want); if (ability_->CheckIsSilentForeground()) { - TAG_LOGI(AAFwkTag::UIABILITY, "Is silent foreground."); + TAG_LOGI(AAFwkTag::UIABILITY, "is silent foreground"); std::lock_guard lock(notifyForegroundLock_); notifyForegroundByWindow_ = true; return; @@ -557,7 +553,7 @@ void UIAbilityImpl::Foreground(const AAFwk::Want &want) notifyForegroundByAbility_ = true; } abilityLifecycleCallbacks_->OnAbilityForeground(ability_); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityImpl::WindowLifeCycleImpl::BackgroundFailed(int32_t type) @@ -572,16 +568,16 @@ void UIAbilityImpl::WindowLifeCycleImpl::BackgroundFailed(int32_t type) void UIAbilityImpl::Background() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr || ability_->GetAbilityInfo() == nullptr || abilityLifecycleCallbacks_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability_ or abilityLifecycleCallbacks_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability_ or abilityLifecycleCallbacks_"); return; } ability_->OnLeaveForeground(); ability_->OnBackground(); lifecycleState_ = AAFwk::ABILITY_STATE_BACKGROUND_NEW; abilityLifecycleCallbacks_->OnAbilityBackground(ability_); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } #endif @@ -616,7 +612,7 @@ bool UIAbilityImpl::AbilityTransaction(const AAFwk::Want &want, const AAFwk::Lif if (!InsightIntentExecuteParam::IsInsightIntentExecute(want)) { Background(); } else { - TAG_LOGD(AAFwkTag::UIABILITY, "HandleExecuteInsightIntentBackground"); + TAG_LOGD(AAFwkTag::UIABILITY, "handleExecuteInsightIntentBackground"); HandleExecuteInsightIntentBackground(want); } #endif @@ -624,11 +620,11 @@ bool UIAbilityImpl::AbilityTransaction(const AAFwk::Want &want, const AAFwk::Lif } default: { ret = false; - TAG_LOGE(AAFwkTag::UIABILITY, "State error."); + TAG_LOGE(AAFwkTag::UIABILITY, "state error"); break; } } - TAG_LOGD(AAFwkTag::UIABILITY, "End retVal is %{public}d.", static_cast(ret)); + TAG_LOGD(AAFwkTag::UIABILITY, "end retVal: %{public}d", static_cast(ret)); return ret; } @@ -672,24 +668,24 @@ void UIAbilityImpl::HandleForegroundNewState(const AAFwk::Want &want, bool &bfla void UIAbilityImpl::HandleExecuteInsightIntentForeground(const AAFwk::Want &want, bool &bflag) { - TAG_LOGI(AAFwkTag::UIABILITY, "Execute insight intent in foreground mode."); + TAG_LOGI(AAFwkTag::UIABILITY, "called"); auto executeParam = std::make_shared(); auto ret = InsightIntentExecuteParam::GenerateFromWant(want, *executeParam); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "Generate execute param failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "invalid params"); HandleForegroundNewState(want, bflag); return; } TAG_LOGD(AAFwkTag::UIABILITY, - "Insight intent bundleName: %{public}s, moduleName: %{public}s, abilityName: %{public}s" + "insightIntent bundleName: %{public}s, moduleName: %{public}s, abilityName: %{public}s" "insightIntentName: %{public}s, executeMode: %{public}d, intentId: %{public}" PRIu64"", executeParam->bundleName_.c_str(), executeParam->moduleName_.c_str(), executeParam->abilityName_.c_str(), executeParam->insightIntentName_.c_str(), executeParam->executeMode_, executeParam->insightIntentId_); auto intentCb = std::make_unique(); intentCb.reset(InsightIntentExecutorAsyncCallback::Create()); if (intentCb == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Create async callback failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "create async callback failed"); HandleForegroundNewState(want, bflag); return; } @@ -710,10 +706,10 @@ void UIAbilityImpl::ExecuteInsightIntentRepeateForeground(const Want &want, TAG_LOGD(AAFwkTag::UIABILITY, "called"); auto asyncCallback = [weak = weak_from_this(), intentId = executeParam->insightIntentId_](InsightIntentExecuteResult result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Execute insight intent finshed, intentId %{public}" PRIu64"", intentId); + TAG_LOGD(AAFwkTag::UIABILITY, "execute insightIntent finshed, intentId %{public}" PRIu64"", intentId); auto abilityImpl = weak.lock(); if (abilityImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability impl is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability impl"); return; } abilityImpl->ExecuteInsightIntentDone(intentId, result); @@ -738,10 +734,10 @@ void UIAbilityImpl::ExecuteInsightIntentMoveToForeground(const Want &want, auto asyncCallback = [weak = weak_from_this(), intentId = executeParam->insightIntentId_](InsightIntentExecuteResult result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Execute insight intent finshed, intentId %{public}" PRIu64"", intentId); + TAG_LOGD(AAFwkTag::UIABILITY, "end, intentId %{public}" PRIu64"", intentId); auto abilityImpl = weak.lock(); if (abilityImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability impl is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability impl"); return; } abilityImpl->ExecuteInsightIntentDone(intentId, result); @@ -757,7 +753,7 @@ void UIAbilityImpl::PostForegroundInsightIntent() { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (ability_ == nullptr || abilityLifecycleCallbacks_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability params invalid."); + TAG_LOGE(AAFwkTag::UIABILITY, "invalid params "); return; } @@ -787,17 +783,17 @@ void UIAbilityImpl::PostForegroundInsightIntent() void UIAbilityImpl::HandleExecuteInsightIntentBackground(const AAFwk::Want &want, bool onlyExecuteIntent) { - TAG_LOGI(AAFwkTag::UIABILITY, "Execute insight intent in background mode."); + TAG_LOGI(AAFwkTag::UIABILITY, "called"); auto executeParam = std::make_shared(); auto ret = InsightIntentExecuteParam::GenerateFromWant(want, *executeParam); if (!ret && !onlyExecuteIntent) { - TAG_LOGE(AAFwkTag::UIABILITY, "Generate execute param failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "invalid params"); Background(); return; } TAG_LOGD(AAFwkTag::UIABILITY, - "Insight intent bundleName: %{public}s, moduleName: %{public}s, abilityName: %{public}s" + "insightIntent bundleName: %{public}s, moduleName: %{public}s, abilityName: %{public}s" "insightIntentName: %{public}s, executeMode: %{public}d, intentId: %{public}" PRIu64"", executeParam->bundleName_.c_str(), executeParam->moduleName_.c_str(), executeParam->abilityName_.c_str(), executeParam->insightIntentName_.c_str(), executeParam->executeMode_, executeParam->insightIntentId_); @@ -805,7 +801,7 @@ void UIAbilityImpl::HandleExecuteInsightIntentBackground(const AAFwk::Want &want auto intentCb = std::make_unique(); intentCb.reset(InsightIntentExecutorAsyncCallback::Create()); if (intentCb == nullptr && !onlyExecuteIntent) { - TAG_LOGE(AAFwkTag::UIABILITY, "Create async callback failed."); + TAG_LOGE(AAFwkTag::UIABILITY, "create async callback failed"); Background(); return; } @@ -825,10 +821,10 @@ void UIAbilityImpl::ExecuteInsightIntentBackgroundByColdBoot(const Want &want, TAG_LOGD(AAFwkTag::UIABILITY, "called"); auto asyncCallback = [weak = weak_from_this(), intentId = executeParam->insightIntentId_](InsightIntentExecuteResult result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Execute insight intent finshed, intentId %{public}" PRIu64"", intentId); + TAG_LOGD(AAFwkTag::UIABILITY, "end, intentId %{public}" PRIu64"", intentId); auto abilityImpl = weak.lock(); if (abilityImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability impl is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability impl"); return; } abilityImpl->Background(); @@ -848,10 +844,10 @@ void UIAbilityImpl::ExecuteInsightIntentBackgroundAlreadyStart(const Want &want, auto asyncCallback = [weak = weak_from_this(), intentId = executeParam->insightIntentId_](InsightIntentExecuteResult result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Execute insight intent finshed, intentId %{public}" PRIu64"", intentId); + TAG_LOGD(AAFwkTag::UIABILITY, "end, intentId %{public}" PRIu64"", intentId); auto abilityImpl = weak.lock(); if (abilityImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability impl is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability impl"); return; } abilityImpl->ExecuteInsightIntentDone(intentId, result); diff --git a/frameworks/native/ability/native/ui_ability_thread.cpp b/frameworks/native/ability/native/ui_ability_thread.cpp index 51fd261d3ba..99da8e668d8 100644 --- a/frameworks/native/ability/native/ui_ability_thread.cpp +++ b/frameworks/native/ability/native/ui_ability_thread.cpp @@ -50,18 +50,18 @@ std::string UIAbilityThread::CreateAbilityName(const std::shared_ptr abilityInfo = abilityRecord->GetAbilityInfo(); if (abilityInfo == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityInfo is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo"); return abilityName; } if (abilityInfo->isNativeAbility) { - TAG_LOGD(AAFwkTag::UIABILITY, "AbilityInfo name is %{public}s.", abilityInfo->name.c_str()); + TAG_LOGE(AAFwkTag::UIABILITY, "abilityInfo name: %{public}s", abilityInfo->name.c_str()); return abilityInfo->name; } #ifdef SUPPORT_GRAPHICS @@ -69,7 +69,7 @@ std::string UIAbilityThread::CreateAbilityName(const std::shared_ptrname; #endif - TAG_LOGD(AAFwkTag::UIABILITY, "Ability name is %{public}s.", abilityName.c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability name: %{public}s", abilityName.c_str()); return abilityName; } @@ -81,19 +81,19 @@ std::shared_ptr UIAbilityThread::CreateAndInitContextDe TAG_LOGD(AAFwkTag::UIABILITY, "called"); std::shared_ptr contextDeal = nullptr; if (application == nullptr || abilityRecord == nullptr || abilityObject == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Application or abilityRecord or abilityObject is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null application or abilityRecord or abilityObject"); return contextDeal; } contextDeal = std::make_shared(); if (contextDeal == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ContextDeal is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null contextDeal"); return contextDeal; } auto abilityInfo = abilityRecord->GetAbilityInfo(); if (abilityInfo == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ContextDeal is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityInfo"); return nullptr; } @@ -114,27 +114,27 @@ void UIAbilityThread::Attach(const std::shared_ptr { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if ((application == nullptr) || (abilityRecord == nullptr) || (mainRunner == nullptr)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Application or abilityRecord or mainRunner is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null application or abilityRecord or mainRunner"); return; } // 1.new AbilityHandler std::string abilityName = CreateAbilityName(abilityRecord); if (abilityName.empty()) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityName is empty."); + TAG_LOGE(AAFwkTag::UIABILITY, "empty AabilityName"); return; } - TAG_LOGD(AAFwkTag::UIABILITY, "Begin ability: %{public}s.", abilityRecord->GetAbilityInfo()->name.c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "ability: %{public}s", abilityRecord->GetAbilityInfo()->name.c_str()); abilityHandler_ = std::make_shared(mainRunner); if (abilityHandler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return; } // 2.new ability auto ability = AppExecFwk::AbilityLoader::GetInstance().GetUIAbilityByName(abilityName); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->SetAbilityRecordId(abilityRecord->GetAbilityRecordId()); @@ -162,20 +162,20 @@ void UIAbilityThread::AttachInner(const std::shared_ptr(); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } abilityImpl_->Init(application, abilityRecord, currentAbility_, abilityHandler_, token_); // ability attach : ipc - TAG_LOGI(AAFwkTag::UIABILITY, "LoadLifecycle: Attach uiability."); + TAG_LOGI(AAFwkTag::UIABILITY, "attach uiability"); FreezeUtil::LifecycleFlow flow = { token_, FreezeUtil::TimeoutState::LOAD }; std::string entry = std::to_string(TimeUtil::SystemTimeMillisecond()) + "; AbilityThread::Attach start; the load lifecycle."; FreezeUtil::GetInstance().AddLifecycleEvent(flow, entry); ErrCode err = AbilityManagerClient::GetInstance()->AttachAbilityThread(this, token_); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::UIABILITY, "Err is %{public}d.", err); + TAG_LOGE(AAFwkTag::UIABILITY, "err: %{public}d", err); return; } FreezeUtil::GetInstance().DeleteLifecycleEvent(flow); @@ -186,28 +186,28 @@ void UIAbilityThread::Attach(const std::shared_ptr const std::shared_ptr &stageContext) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if ((application == nullptr) || (abilityRecord == nullptr)) { - TAG_LOGE(AAFwkTag::UIABILITY, "Application or abilityRecord is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null application or abilityRecord"); return; } // 1.new AbilityHandler std::string abilityName = CreateAbilityName(abilityRecord); runner_ = AppExecFwk::EventRunner::Create(abilityName); if (runner_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Runner is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null runner"); return; } abilityHandler_ = std::make_shared(runner_); if (abilityHandler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return; } // 2.new ability auto ability = AppExecFwk::AbilityLoader::GetInstance().GetUIAbilityByName(abilityName); if (ability == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } ability->SetAbilityRecordId(abilityRecord->GetAbilityRecordId()); @@ -226,7 +226,7 @@ void UIAbilityThread::Attach(const std::shared_ptr application, token_, stageContext, abilityRecord->GetAbilityRecordId())); AttachInner(application, abilityRecord, stageContext); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityThread::HandleAbilityTransaction( @@ -235,9 +235,9 @@ void UIAbilityThread::HandleAbilityTransaction( std::string connector = "##"; std::string traceName = __PRETTY_FUNCTION__ + connector + want.GetElement().GetAbilityName(); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, traceName); - TAG_LOGD(AAFwkTag::UIABILITY, "Lifecycle: name is %{public}s.", want.GetElement().GetAbilityName().c_str()); + TAG_LOGD(AAFwkTag::UIABILITY, "name: %{public}s", want.GetElement().GetAbilityName().c_str()); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } std::string methodName = "HandleAbilityTransaction"; @@ -246,7 +246,7 @@ void UIAbilityThread::HandleAbilityTransaction( abilityImpl_->SetCallingContext(lifeCycleStateInfo.caller.deviceId, lifeCycleStateInfo.caller.bundleName, lifeCycleStateInfo.caller.abilityName, lifeCycleStateInfo.caller.moduleName); abilityImpl_->HandleAbilityTransaction(want, lifeCycleStateInfo, sessionInfo); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityThread::AddLifecycleEvent(uint32_t state, std::string &methodName) const @@ -269,60 +269,55 @@ void UIAbilityThread::HandleShareData(const int32_t &uniqueId) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } abilityImpl_->HandleShareData(uniqueId); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); } void UIAbilityThread::ScheduleSaveAbilityState() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } abilityImpl_->DispatchSaveAbilityState(); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); } void UIAbilityThread::ScheduleRestoreAbilityState(const AppExecFwk::PacMap &state) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } abilityImpl_->DispatchRestoreAbilityState(state); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); } void UIAbilityThread::ScheduleUpdateConfiguration(const AppExecFwk::Configuration &config) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); HandleUpdateConfiguration(config); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); } void UIAbilityThread::HandleUpdateConfiguration(const AppExecFwk::Configuration &config) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } abilityImpl_->ScheduleUpdateConfiguration(config); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); } void UIAbilityThread::ScheduleAbilityTransaction( const Want &want, const LifeCycleStateInfo &lifeCycleStateInfo, sptr sessionInfo) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::UIABILITY, "Lifecycle: name:%{public}s,targeState:%{public}d,isNewWant:%{public}d", + TAG_LOGI(AAFwkTag::UIABILITY, "name:%{public}s,targeState:%{public}d,isNewWant:%{public}d", want.GetElement().GetAbilityName().c_str(), lifeCycleStateInfo.state, lifeCycleStateInfo.isNewWant); @@ -330,18 +325,18 @@ void UIAbilityThread::ScheduleAbilityTransaction( AddLifecycleEvent(lifeCycleStateInfo.state, methodName); if (token_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "token_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null token_"); return; } if (abilityHandler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return; } wptr weak = this; auto task = [weak, want, lifeCycleStateInfo, sessionInfo]() { auto abilityThread = weak.promote(); if (abilityThread == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityThread is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityThread"); return; } @@ -349,7 +344,7 @@ void UIAbilityThread::ScheduleAbilityTransaction( }; bool ret = abilityHandler_->PostTask(task, "UIAbilityThread:AbilityTransaction"); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "PostTask error."); + TAG_LOGE(AAFwkTag::UIABILITY, "postTask error"); } } @@ -357,56 +352,56 @@ void UIAbilityThread::ScheduleShareData(const int32_t &uniqueId) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (token_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "token_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null token_"); return; } if (abilityHandler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return; } wptr weak = this; auto task = [weak, uniqueId]() { auto abilityThread = weak.promote(); if (abilityThread == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityThread is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityThread"); return; } abilityThread->HandleShareData(uniqueId); }; bool ret = abilityHandler_->PostTask(task, "UIAbilityThread:ShareData"); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "postTask error."); + TAG_LOGE(AAFwkTag::UIABILITY, "postTask error"); } } bool UIAbilityThread::SchedulePrepareTerminateAbility() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return true; } if (abilityHandler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return false; } if (getpid() == gettid()) { bool ret = abilityImpl_->PrepareTerminateAbility(); - TAG_LOGD(AAFwkTag::UIABILITY, "End ret is %{public}d.", ret); + TAG_LOGD(AAFwkTag::UIABILITY, "ret: %{public}d", ret); return ret; } wptr weak = this; auto task = [weak]() { auto abilityThread = weak.promote(); if (abilityThread == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityThread is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityThread"); return; } abilityThread->HandlePrepareTermianteAbility(); }; bool ret = abilityHandler_->PostTask(task, "UIAbilityThread:PrepareTerminateAbility"); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "PostTask error."); + TAG_LOGE(AAFwkTag::UIABILITY, "postTask error"); return false; } @@ -414,23 +409,23 @@ bool UIAbilityThread::SchedulePrepareTerminateAbility() auto condition = [weak] { auto abilityThread = weak.promote(); if (abilityThread == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityThread is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityThread"); return false; } return abilityThread->isPrepareTerminateAbilityDone_.load(); }; if (!cv_.wait_for(lock, std::chrono::milliseconds(PREPARE_TO_TERMINATE_TIMEOUT_MILLISECONDS), condition)) { - TAG_LOGW(AAFwkTag::UIABILITY, "Wait timeout."); + TAG_LOGW(AAFwkTag::UIABILITY, "wait timeout"); } - TAG_LOGD(AAFwkTag::UIABILITY, "End, ret is %{public}d.", isPrepareTerminate_); + TAG_LOGD(AAFwkTag::UIABILITY, "ret: %{public}d", isPrepareTerminate_); return isPrepareTerminate_; } void UIAbilityThread::SendResult(int requestCode, int resultCode, const Want &want) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityHandler_ == nullptr || requestCode == -1) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr or requestCode is -1."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_ or requestCode is -1"); return; } @@ -438,7 +433,7 @@ void UIAbilityThread::SendResult(int requestCode, int resultCode, const Want &wa auto task = [weak, requestCode, resultCode, want]() { auto abilityThread = weak.promote(); if (abilityThread == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityThread is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityThread"); return; } @@ -446,31 +441,29 @@ void UIAbilityThread::SendResult(int requestCode, int resultCode, const Want &wa abilityThread->abilityImpl_->SendResult(requestCode, resultCode, want); return; } - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); }; bool ret = abilityHandler_->PostTask(task, "UIAbilityThread:SendResult"); if (!ret) { - TAG_LOGE(AAFwkTag::UIABILITY, "PostTask error"); + TAG_LOGE(AAFwkTag::UIABILITY, "postTask error"); } - TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityThread::ContinueAbility(const std::string &deviceId, uint32_t versionCode) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } abilityImpl_->ContinueAbility(deviceId, versionCode); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); } void UIAbilityThread::NotifyContinuationResult(int32_t result) { - TAG_LOGD(AAFwkTag::UIABILITY, "Result: %{public}d.", result); + TAG_LOGD(AAFwkTag::UIABILITY, "result: %{public}d", result); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } abilityImpl_->NotifyContinuationResult(result); @@ -478,9 +471,9 @@ void UIAbilityThread::NotifyContinuationResult(int32_t result) void UIAbilityThread::NotifyMemoryLevel(int32_t level) { - TAG_LOGD(AAFwkTag::UIABILITY, "Result: %{public}d.", level); + TAG_LOGD(AAFwkTag::UIABILITY, "result: %{public}d", level); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } abilityImpl_->NotifyMemoryLevel(level); @@ -493,7 +486,7 @@ std::shared_ptr UIAbilityThread::BuildAbilityContext( { auto abilityContextImpl = std::make_shared(); if (abilityContextImpl == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityContextImpl is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityContextImpl"); return abilityContextImpl; } abilityContextImpl->SetStageContext(stageContext); @@ -508,25 +501,25 @@ void UIAbilityThread::DumpAbilityInfo(const std::vector ¶ms, st { TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (token_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "token_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null token_"); return; } if (abilityHandler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return; } wptr weak = this; auto task = [weak, params, token = token_]() { auto abilityThread = weak.promote(); if (abilityThread == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityThread is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityThread"); return; } std::vector dumpInfo; abilityThread->DumpAbilityInfoInner(params, dumpInfo); ErrCode err = AbilityManagerClient::GetInstance()->DumpAbilityInfoDone(dumpInfo, token); if (err != ERR_OK) { - TAG_LOGE(AAFwkTag::UIABILITY, "Failed err is %{public}d.", err); + TAG_LOGE(AAFwkTag::UIABILITY, "failed err: %{public}d", err); } }; abilityHandler_->PostTask(task, "UIAbilityThread:DumpAbilityInfo"); @@ -535,20 +528,20 @@ void UIAbilityThread::DumpAbilityInfo(const std::vector ¶ms, st #ifdef SUPPORT_SCREEN void UIAbilityThread::DumpAbilityInfoInner(const std::vector ¶ms, std::vector &info) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (currentAbility_ == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "currentAbility_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null currentAbility_"); return; } auto scene = currentAbility_->GetScene(); if (scene == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "scene is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null scene"); return; } auto window = scene->GetMainWindow(); if (window == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Window is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null Window"); return; } window->DumpInfo(params, info); @@ -556,7 +549,7 @@ void UIAbilityThread::DumpAbilityInfoInner(const std::vector ¶m if (params.empty()) { DumpOtherInfo(info); } - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } #else void UIAbilityThread::DumpAbilityInfoInner(const std::vector ¶ms, std::vector &info) @@ -575,12 +568,12 @@ void UIAbilityThread::DumpOtherInfo(std::vector &info) std::string dumpInfo = " event:"; info.push_back(dumpInfo); if (abilityHandler_ == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return; } auto runner = abilityHandler_->GetEventRunner(); if (runner == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "Runner is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null runner"); return; } dumpInfo = ""; @@ -589,12 +582,12 @@ void UIAbilityThread::DumpOtherInfo(std::vector &info) if (currentAbility_ != nullptr) { const auto ablityContext = currentAbility_->GetAbilityContext(); if (ablityContext == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "Ablitycontext is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null Ablitycontext"); return; } const auto localCallContainer = ablityContext->GetLocalCallContainer(); if (localCallContainer == nullptr) { - TAG_LOGD(AAFwkTag::UIABILITY, "LocalCallContainer is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null localCallContainer"); return; } localCallContainer->DumpCalls(info); @@ -603,13 +596,13 @@ void UIAbilityThread::DumpOtherInfo(std::vector &info) void UIAbilityThread::CallRequest() { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (currentAbility_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } if (abilityHandler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return; } @@ -618,7 +611,7 @@ void UIAbilityThread::CallRequest() auto syncTask = [ability = weakAbility, &retval]() { auto currentAbility = ability.lock(); if (currentAbility == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Ability is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null ability"); return; } @@ -626,19 +619,19 @@ void UIAbilityThread::CallRequest() }; abilityHandler_->PostSyncTask(syncTask, "UIAbilityThread:CallRequest"); AbilityManagerClient::GetInstance()->CallRequestDone(token_, retval); - TAG_LOGD(AAFwkTag::UIABILITY, "End."); + TAG_LOGD(AAFwkTag::UIABILITY, "end"); } void UIAbilityThread::OnExecuteIntent(const Want &want) { - TAG_LOGD(AAFwkTag::UIABILITY, "Begin."); + TAG_LOGD(AAFwkTag::UIABILITY, "called"); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } if (abilityHandler_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityHandler_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityHandler_"); return; } @@ -646,7 +639,7 @@ void UIAbilityThread::OnExecuteIntent(const Want &want) auto task = [weak, want]() { auto abilityThread = weak.promote(); if (abilityThread == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "AbilityThread is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null AbilityThread"); return; } if (abilityThread->abilityImpl_ != nullptr) { @@ -661,11 +654,11 @@ void UIAbilityThread::HandlePrepareTermianteAbility() { std::unique_lock lock(mutex_); if (abilityImpl_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "abilityImpl_ is nullptr."); + TAG_LOGE(AAFwkTag::UIABILITY, "null abilityImpl_"); return; } isPrepareTerminate_ = abilityImpl_->PrepareTerminateAbility(); - TAG_LOGD(AAFwkTag::UIABILITY, "End ret is %{public}d.", isPrepareTerminate_); + TAG_LOGD(AAFwkTag::UIABILITY, "end ret: %{public}d", isPrepareTerminate_); isPrepareTerminateAbilityDone_.store(true); cv_.notify_all(); } @@ -674,7 +667,7 @@ int UIAbilityThread::CreateModalUIExtension(const Want &want) { TAG_LOGD(AAFwkTag::UIABILITY, "Call"); if (currentAbility_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "current ability is nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null current ability"); return ERR_INVALID_VALUE; } return currentAbility_->CreateModalUIExtension(want); @@ -683,7 +676,7 @@ int UIAbilityThread::CreateModalUIExtension(const Want &want) void UIAbilityThread::UpdateSessionToken(sptr sessionToken) { if (currentAbility_ == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "current ability is nullptr"); + TAG_LOGE(AAFwkTag::UIABILITY, "null current ability"); return; } #ifdef SUPPORT_SCREEN diff --git a/frameworks/native/ability/native/ui_service_extension_ability/ui_service_extension.cpp b/frameworks/native/ability/native/ui_service_extension_ability/ui_service_extension.cpp index 3dbf2c3c4c8..82538fb8309 100644 --- a/frameworks/native/ability/native/ui_service_extension_ability/ui_service_extension.cpp +++ b/frameworks/native/ability/native/ui_service_extension_ability/ui_service_extension.cpp @@ -82,7 +82,7 @@ sptr UIServiceExtension::GetWindowOption(const AAFwk::Want { auto option = sptr::MakeSptr(); if (option == nullptr) { - TAG_LOGE(AAFwkTag::UIABILITY, "Option is null."); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "null option"); return nullptr; } if (extensionWindowConfig->windowAttribute == Rosen::ExtensionWindowAttribute::SUB_WINDOW) { @@ -105,7 +105,7 @@ sptr UIServiceExtension::GetWindowOption(const AAFwk::Want extensionWindowConfig->systemWindowOptions.windowType, winType)) { option->SetWindowType(winType); } else { - TAG_LOGE(AAFwkTag::UIABILITY, "ParseSystemWindowTypeForApiWindowType error"); + TAG_LOGE(AAFwkTag::UISERVC_EXT, "parseSystemWindowTypeForApiWindowType error"); return nullptr; } } diff --git a/frameworks/native/appkit/app/ohos_application.cpp b/frameworks/native/appkit/app/ohos_application.cpp index d17eea8076c..c7b9dd96cd9 100644 --- a/frameworks/native/appkit/app/ohos_application.cpp +++ b/frameworks/native/appkit/app/ohos_application.cpp @@ -465,7 +465,7 @@ void OHOSApplication::OnConfigurationUpdated(Configuration config) bool isUpdateAppLanguage = isUpdateLanguage(config, language, languageIsSetByApp, globalLanguageIsSetByApp); // If size is not equal to 0, other keys need to be updated. if (!isUpdateAppColor && !isUpdateAppFontSize && !isUpdateAppLanguage && config.GetItemSize() == 0) { - TAG_LOGD(AAFwkTag::UIABILITY, "Configuration does not need to be updated"); + TAG_LOGD(AAFwkTag::APPKIT, "configuration need not updated"); return; } std::vector changeKeyV; @@ -474,7 +474,7 @@ void OHOSApplication::OnConfigurationUpdated(Configuration config) configuration_->CompareDifferent(changeKeyV, config); configuration_->Merge(changeKeyV, config); } - TAG_LOGD(AAFwkTag::UIABILITY, "configuration_: %{public}s", configuration_->GetName().c_str()); + TAG_LOGD(AAFwkTag::APPKIT, "configuration_: %{public}s", configuration_->GetName().c_str()); // Update resConfig of resource manager, which belongs to application context. UpdateAppContextResMgr(config); -- Gitee