From 97a2928022efdbfc9a32bc1a5513c1e165c93e5f Mon Sep 17 00:00:00 2001 From: qiudengcheng Date: Thu, 26 May 2022 04:02:11 +0000 Subject: [PATCH 1/3] Description:Added stability judgment. Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I58SJJ; Signed-off-by: --- services/abilitymgr_lite/src/ability_service.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp index 4b3d2e4..a96dc77 100755 --- a/services/abilitymgr_lite/src/ability_service.cpp +++ b/services/abilitymgr_lite/src/ability_service.cpp @@ -440,6 +440,10 @@ void AbilityService::OnActiveDone(uint16_t token) return; } if (topRecord->GetToken() != LAUNCHER_TOKEN) { + int native_state = STATE_UNINITIALIZED; + if (g_NativeAbility != nullptr) { + g_NativeAbility->GetState() = native_state; + } if (topRecord->GetState() == SCHEDULE_ACTIVE) { HILOG_ERROR(HILOG_MODULE_AAFWK, "js is in active state, native state is %{public}d", g_NativeAbility->GetState()); -- Gitee From c2ef8ec740d386e6670ed537dfa6f694f9297a34 Mon Sep 17 00:00:00 2001 From: qiudengcheng Date: Thu, 26 May 2022 06:54:07 +0000 Subject: [PATCH 2/3] Description:Prevent null pointers Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I58SJJ; Signed-off-by: --- services/abilitymgr_lite/src/ability_service.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp index a96dc77..6f7419e 100755 --- a/services/abilitymgr_lite/src/ability_service.cpp +++ b/services/abilitymgr_lite/src/ability_service.cpp @@ -442,17 +442,17 @@ void AbilityService::OnActiveDone(uint16_t token) if (topRecord->GetToken() != LAUNCHER_TOKEN) { int native_state = STATE_UNINITIALIZED; if (g_NativeAbility != nullptr) { - g_NativeAbility->GetState() = native_state; + native_state = g_NativeAbility->GetState(); } if (topRecord->GetState() == SCHEDULE_ACTIVE) { HILOG_ERROR(HILOG_MODULE_AAFWK, - "js is in active state, native state is %{public}d", g_NativeAbility->GetState()); + "js is in active state, native state is %{public}d", native_state); return; } if (topRecord->GetState() != SCHEDULE_BACKGROUND) { APP_ERRCODE_EXTRA(EXCE_ACE_APP_START, EXCE_ACE_APP_START_LAUNCHER_EXIT_FAILED); HILOG_ERROR(HILOG_MODULE_AAFWK, - "Active launcher js bg fail, native state is %{public}d", g_NativeAbility->GetState()); + "Active launcher js bg fail, native state is %{public}d", native_state); abilityStack_.PopAbility(); DeleteRecordInfo(topRecord->GetToken()); } else if (topRecord->IsTerminated()) { @@ -460,7 +460,7 @@ void AbilityService::OnActiveDone(uint16_t token) } } return; - } + }x // the js app active if (topRecord->GetToken() == token) { APP_EVENT(MT_ACE_APP_ACTIVE); -- Gitee From ecaa6112f2ca20481fdc3cfa1624a712b9bbdcc0 Mon Sep 17 00:00:00 2001 From: qiudengcheng Date: Thu, 26 May 2022 06:56:15 +0000 Subject: [PATCH 3/3] Description:Prevent null pointers Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I58SJJ; Signed-off-by: --- services/abilitymgr_lite/src/ability_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp index 6f7419e..14278d1 100755 --- a/services/abilitymgr_lite/src/ability_service.cpp +++ b/services/abilitymgr_lite/src/ability_service.cpp @@ -460,7 +460,7 @@ void AbilityService::OnActiveDone(uint16_t token) } } return; - }x + } // the js app active if (topRecord->GetToken() == token) { APP_EVENT(MT_ACE_APP_ACTIVE); -- Gitee