From 1d6e5e710d0b3df79cbe63c11544d1d6b8a595c0 Mon Sep 17 00:00:00 2001 From: zhaoyuan Date: Tue, 27 Jul 2021 15:22:33 +0800 Subject: [PATCH] fixed d129caa from https://gitee.com/skyblackleon/aafwk_aafwk_lite/pulls/71 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