From 55f9d06b8646a263d2c374cb0ed36872d72f3805 Mon Sep 17 00:00:00 2001 From: zhaoyuan Date: Tue, 27 Jul 2021 15:22:33 +0800 Subject: [PATCH 1/3] fix bugs --- .../abilitymgr_lite/src/slite/abilityms_slite_client.cpp | 3 ++- services/abilitymgr_lite/src/ability_service.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp b/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp index 6c5006c..5b07467 100755 --- a/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp +++ b/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp @@ -25,6 +25,7 @@ #include "securec.h" #include "unistd.h" #include "want_utils.h" +#include "utils.h" namespace OHOS { bool AbilityMsClient::Initialize() const @@ -147,7 +148,7 @@ int AbilityMsClient::ForceStop(char *bundlename) const .msgId = TERMINATE_APP_BY_BUNDLENAME, .data = reinterpret_cast(name), .len = strlen(name), - } + }; return SAMGR_SendRequest(service->GetIdentity(), &request, nullptr); } diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp index b5e5cd6..1e14230 100755 --- a/services/abilitymgr_lite/src/ability_service.cpp +++ b/services/abilitymgr_lite/src/ability_service.cpp @@ -176,7 +176,7 @@ int32_t AbilityService::StartAbility(AbilitySvcInfo *info) HILOG_INFO(HILOG_MODULE_AAFWK, "Js app already started or starting."); } else { // js to js - HILOG_INFO(HILOG_MODULE_AAFWK, "Terminate pre js app when js to js") + HILOG_INFO(HILOG_MODULE_AAFWK, "Terminate pre js app when js to js"); TerminateAbility(topRecord->GetToken()); pendingToken_ = GenerateToken(); } @@ -249,8 +249,8 @@ int32_t AbilityService::ForceStop(char* bundlename) //stop js app if (strcmp(abilityStack_.GetTopAbility()->GetAppName(), bundlename) == 0) { - HILOG_INFO(HILOG_MODULE_AAFWK, "ForceStop [%s]", bundlename); AbilityRecord *topRecord = const_cast(abilityStack_.GetTopAbility()); + HILOG_INFO(HILOG_MODULE_AAFWK, "ForceStop [%u]", topRecord->GetToken()); return TerminateAbility(topRecord->GetToken()); } @@ -315,7 +315,7 @@ bool AbilityService::CheckResponse(const char *bundleName) if (callBackFunc != nullptr) { int ret = (*callBackFunc)(bundleName); if (ret != ERR_OK) { - HILOG_ERROR(HILOG_MODULE_AAFWK, "calling ability callback failed bundlename is: [%s]", bundleName); + HILOG_ERROR(HILOG_MODULE_AAFWK, "calling ability callback failed"); return false; } } -- Gitee From d129caafd3db4c45c6fba749acc5b48becf003f4 Mon Sep 17 00:00:00 2001 From: zhaoyuan Date: Tue, 27 Jul 2021 15:22:33 +0800 Subject: [PATCH 2/3] fix bugs Signed-off-by: zhaoyuan --- .../abilitymgr_lite/src/slite/abilityms_slite_client.cpp | 3 ++- services/abilitymgr_lite/src/ability_service.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp b/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp index 6c5006c..5b07467 100755 --- a/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp +++ b/frameworks/abilitymgr_lite/src/slite/abilityms_slite_client.cpp @@ -25,6 +25,7 @@ #include "securec.h" #include "unistd.h" #include "want_utils.h" +#include "utils.h" namespace OHOS { bool AbilityMsClient::Initialize() const @@ -147,7 +148,7 @@ int AbilityMsClient::ForceStop(char *bundlename) const .msgId = TERMINATE_APP_BY_BUNDLENAME, .data = reinterpret_cast(name), .len = strlen(name), - } + }; return SAMGR_SendRequest(service->GetIdentity(), &request, nullptr); } diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp index b5e5cd6..1e14230 100755 --- a/services/abilitymgr_lite/src/ability_service.cpp +++ b/services/abilitymgr_lite/src/ability_service.cpp @@ -176,7 +176,7 @@ int32_t AbilityService::StartAbility(AbilitySvcInfo *info) HILOG_INFO(HILOG_MODULE_AAFWK, "Js app already started or starting."); } else { // js to js - HILOG_INFO(HILOG_MODULE_AAFWK, "Terminate pre js app when js to js") + HILOG_INFO(HILOG_MODULE_AAFWK, "Terminate pre js app when js to js"); TerminateAbility(topRecord->GetToken()); pendingToken_ = GenerateToken(); } @@ -249,8 +249,8 @@ int32_t AbilityService::ForceStop(char* bundlename) //stop js app if (strcmp(abilityStack_.GetTopAbility()->GetAppName(), bundlename) == 0) { - HILOG_INFO(HILOG_MODULE_AAFWK, "ForceStop [%s]", bundlename); AbilityRecord *topRecord = const_cast(abilityStack_.GetTopAbility()); + HILOG_INFO(HILOG_MODULE_AAFWK, "ForceStop [%u]", topRecord->GetToken()); return TerminateAbility(topRecord->GetToken()); } @@ -315,7 +315,7 @@ bool AbilityService::CheckResponse(const char *bundleName) if (callBackFunc != nullptr) { int ret = (*callBackFunc)(bundleName); if (ret != ERR_OK) { - HILOG_ERROR(HILOG_MODULE_AAFWK, "calling ability callback failed bundlename is: [%s]", bundleName); + HILOG_ERROR(HILOG_MODULE_AAFWK, "calling ability callback failed"); return false; } } -- Gitee From 7b2240139d7289ba6c5f446b4e4e3f380c001a48 Mon Sep 17 00:00:00 2001 From: zhaoyuan Date: Sun, 1 Aug 2021 13:21:26 +0800 Subject: [PATCH 3/3] fix bugs Signed-off-by: zhaoyuan --- services/abilitymgr_lite/include/ability_service.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/abilitymgr_lite/include/ability_service.h b/services/abilitymgr_lite/include/ability_service.h index 787a723..999c401 100755 --- a/services/abilitymgr_lite/include/ability_service.h +++ b/services/abilitymgr_lite/include/ability_service.h @@ -26,6 +26,7 @@ #include "nocopyable.h" #include "want.h" #include "slite_ability.h" +#include "ability_state.h" namespace OHOS { struct AbilitySvcInfo { -- Gitee