From 6900612f69bcf5f73f9efc709a442aa75003c6c5 Mon Sep 17 00:00:00 2001 From: wangdengjia Date: Tue, 24 May 2022 15:44:08 +0800 Subject: [PATCH] IssueNo:#I590CN Description:Do not delete application files when package scanning fails Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No Signed-off-by: wangdengjia Change-Id: I09bfe2bc46d2800946a81cb11bef274deddb6e58 --- .../bundlemgr_lite/src/gt_bundle_manager_service.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index d9ea48e..40420ea 100755 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -390,6 +390,7 @@ void GtManagerService::ScanPackages() if (jsEngineVer_ == nullptr) { HILOG_WARN(HILOG_MODULE_AAFWK, "[BMS] get jsEngine version fail when restart!"); } + HILOG_INFO(HILOG_MODULE_AAFWK, "[BMS] get jsEngine version success!"); } void GtManagerService::RemoveSystemAppPathList(List *systemPathList) @@ -678,7 +679,6 @@ bool GtManagerService::ReloadBundleInfo(const char *profileDir, const char *appI AdapterFree(bundleRes); APP_ERRCODE_EXTRA(EXCE_ACE_APP_SCAN, EXCE_ACE_APP_SCAN_PARSE_PROFILE_FALIED); HILOG_ERROR(HILOG_MODULE_AAFWK, "[BMS] reload bundle info fail!, isSystemApp is %{public}d", isSystemApp); - BundleUtil::RemoveDir(profileDir); return false; } @@ -775,6 +775,13 @@ void GtManagerService::TransformJsToBcWhenRestart(const char *codePath, const ch return; } + if (jsEngineVer_ == nullptr) { + cJSON_Delete(installRecordJson); + AdapterFree(bundleJsonPath); + HILOG_ERROR(HILOG_MODULE_AAFWK, "[BMS] TransformJsToBcWhenRestart jsEngineVer_ is nullptr!"); + return; + } + cJSON *jsEngineVerObj = cJSON_CreateString(jsEngineVer_); if (jsEngineVerObj == nullptr) { cJSON_Delete(installRecordJson);