diff --git a/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp b/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp index 6fc4759141121029404339eb3c759d5c4f8fd996..4cb274239e2d0383c0be840675d91ba97d2a9a15 100644 --- a/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp +++ b/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp @@ -183,7 +183,7 @@ void EtsAbilityManager::IsEmbeddedOpenAllowed(ani_env *env, ani_object contextOb void EtsAbilityManager::NativeOn(ani_env *env, ani_string aniType, ani_object aniObserver) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "nativeOn called %{public}p", aniObserver); + TAG_LOGD(AAFwkTag::ABILITYMGR, "nativeOn called"); if (env == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "env null ptr"); return; @@ -229,7 +229,7 @@ void EtsAbilityManager::NativeOn(ani_env *env, ani_string aniType, ani_object an void EtsAbilityManager::NativeOff(ani_env *env, ani_string aniType, ani_object aniObserver) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "nativeOff called %{public}p", aniObserver); + TAG_LOGD(AAFwkTag::ABILITYMGR, "nativeOff called"); if (env == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "env null ptr"); return; diff --git a/frameworks/ets/ani/app_manager/include/ets_ability_first_frame_state_observer.h b/frameworks/ets/ani/app_manager/include/ets_ability_first_frame_state_observer.h index 65f37ca59451328b8d409651cadde48fdf87ce43..b250a0d06885ec2a7885f03fdf221ae554f75a79 100644 --- a/frameworks/ets/ani/app_manager/include/ets_ability_first_frame_state_observer.h +++ b/frameworks/ets/ani/app_manager/include/ets_ability_first_frame_state_observer.h @@ -46,8 +46,8 @@ public: ani_ref GetAniObserver() { return etsObserverObject_; } private: ani_status AniSendEvent(const std::function task); - ani_vm *etsVm_; - ani_ref etsObserverObject_; + ani_vm *etsVm_ = nullptr; + ani_ref etsObserverObject_ = nullptr; std::shared_ptr mainHandler_ = nullptr; }; diff --git a/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp b/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp index e094ed923b224c95e2f642e4e93db880069057fb..7a4779205e5fbb762c7f47c1e4a8b0c3b47e60c7 100644 --- a/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp +++ b/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp @@ -1115,7 +1115,7 @@ void EtsAppManager::OnOnAbilityFirstFrameState( ani_env *env, ani_string type, ani_object aniObserver, ani_object aniBundleName) { #ifdef SUPPORT_SCREEN - TAG_LOGD(AAFwkTag::APPMGR, "OnOnAbilityFirstFrameState called %{public}p", aniObserver); + TAG_LOGD(AAFwkTag::APPMGR, "OnOnAbilityFirstFrameState called"); if (env == nullptr) { TAG_LOGE(AAFwkTag::APPMGR, "env null ptr"); return; @@ -1203,7 +1203,7 @@ void EtsAppManager::OnOnAppForegroundState(ani_env *env, ani_string type, ani_ob void EtsAppManager::OnOffAbilityFirstFrameState(ani_env *env, ani_string type, ani_object aniObserver) { #ifdef SUPPORT_SCREEN - TAG_LOGD(AAFwkTag::APPMGR, "OnOffAbilityFirstFrameState called %{public}p", aniObserver); + TAG_LOGD(AAFwkTag::APPMGR, "OnOffAbilityFirstFrameState called"); if (env == nullptr) { TAG_LOGE(AAFwkTag::APPMGR, "env null ptr"); return; diff --git a/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp index cd1b713570a61a7963402813b952eb8ed3917acf..1f89d73b0ee2ddc2d83a70ad7dab2830deae265d 100644 --- a/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp +++ b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp @@ -717,8 +717,7 @@ FormState ETSFormExtension::OnAcquireFormState(const Want &want) ani_status status = env->Object_GetFieldByName_Ref( static_cast(etsAbilityObj_->aniRef), "onAcquireFormState", &nameRef); if (status != ANI_OK) { - TAG_LOGE(AAFwkTag::FORM_EXT, "Object_GetFieldByName status: %{public}d, %{public}p, %{public}p", - status, etsAbilityObj_->aniRef, etsAbilityObj_->aniObj); + TAG_LOGE(AAFwkTag::FORM_EXT, "onAcquireFormState GetField status: %{public}d", status); return AppExecFwk::FormState::DEFAULT; } ani_ref argv[] = { wantRef }; diff --git a/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp b/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp index 88d10cf71044c018daf1506a2e56dd260a29018a..2ed838eb733609ad8cdb688d659b0c3f6f26053f 100644 --- a/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp +++ b/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp @@ -120,6 +120,10 @@ void TriggerCompleteCallBack::OnSendFinished( dataWorker->wantAgent = new (std::nothrow) WantAgent(triggerCompleteInfo_.wantAgent->GetPendingWant()); } OnSendFinishedCallback(dataWorker); + if (dataWorker->wantAgent != nullptr) { + delete dataWorker->wantAgent; + dataWorker->wantAgent = nullptr; + } if (dataWorker != nullptr) { delete dataWorker; dataWorker = nullptr;