From d93e38613c469dd750852585976e91d9f9c94e21 Mon Sep 17 00:00:00 2001 From: songjindian Date: Mon, 24 Apr 2023 20:45:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: songjindian --- services/abilitymgr_lite/include/slite/bms_helper.h | 2 ++ .../src/slite/ability_record_manager.cpp | 13 +------------ services/abilitymgr_lite/src/slite/bms_helper.cpp | 9 +++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/services/abilitymgr_lite/include/slite/bms_helper.h b/services/abilitymgr_lite/include/slite/bms_helper.h index 8cceeda..7cc432e 100644 --- a/services/abilitymgr_lite/include/slite/bms_helper.h +++ b/services/abilitymgr_lite/include/slite/bms_helper.h @@ -52,6 +52,8 @@ public: uint8_t QueryAbilitySvcInfo(const Want *want, AbilitySvcInfo *svcInfo); bool IsValidAbility(const AbilityInfo *abilityInfo); + + void ClearAbilitySvcInfo(AbilitySvcInfo *abilitySvcInfo); private: List bundleNames_ {}; }; diff --git a/services/abilitymgr_lite/src/slite/ability_record_manager.cpp b/services/abilitymgr_lite/src/slite/ability_record_manager.cpp index bdf8fad..b7f487e 100644 --- a/services/abilitymgr_lite/src/slite/ability_record_manager.cpp +++ b/services/abilitymgr_lite/src/slite/ability_record_manager.cpp @@ -151,29 +151,18 @@ int32_t AbilityRecordManager::StartAbility(const Want *want) info->bundleName = Utils::Strdup(bundleName); info->path = nullptr; } else { - // JS APP -#ifdef _MINI_BMS_ uint8_t queryRet = BMSHelper::GetInstance().QueryAbilitySvcInfo(want, info); if (queryRet != ERR_OK) { HILOG_ERROR(HILOG_MODULE_AAFWK, "Ability BMS Helper return abilitySvcInfo failed"); - AdapterFree(info->bundleName); - AdapterFree(info->path); - AdapterFree(info->data); AdapterFree(info); return PARAM_CHECK_ERROR; } -#else - info->bundleName = Utils::Strdup(bundleName); - // Here users assign want->data with js app path. - info->path = Utils::Strdup((const char *)want->data); -#endif } info->data = OHOS::Utils::Memdup(want->data, want->dataLength); info->dataLength = want->dataLength; auto ret = StartAbility(info); - AdapterFree(info->bundleName); - AdapterFree(info->path); + BMSHelper::GetInstance().ClearAbilitySvcInfo(info); AdapterFree(info->data); AdapterFree(info); return ret; diff --git a/services/abilitymgr_lite/src/slite/bms_helper.cpp b/services/abilitymgr_lite/src/slite/bms_helper.cpp index 1ba7c79..eabe33d 100644 --- a/services/abilitymgr_lite/src/slite/bms_helper.cpp +++ b/services/abilitymgr_lite/src/slite/bms_helper.cpp @@ -108,4 +108,13 @@ bool BMSHelper::IsValidAbility(const AbilityInfo *abilityInfo) } return true; } + +void BMSHelper::ClearAbilitySvcInfo(AbilitySvcInfo *abilitySvcInfo) +{ + if (abilitySvcInfo == nullptr) { + return; + } + AdapterFree(abilitySvcInfo->bundleName); + AdapterFree(abilitySvcInfo->path); +} } \ No newline at end of file -- Gitee