From 6fac9f3c12a6c9be7d1fff7f6c8ad03f9e2b3b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Tue, 27 Aug 2024 10:16:29 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B95.0Release=20=EF=BC=8C?= =?UTF-8?q?=E4=B8=8E=E9=BB=84=E5=8C=BA=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 邹友松 --- bundle.json | 3 --- .../ability/sa_loader/include/base_service_kits_impl.h | 3 --- foundations/ability/utils/include/json_builder.h | 2 +- interfaces/inner_api/modulemgr/modulemgr.gni | 8 ++------ services/core/ability/common/include/constant.h | 2 +- services/engine/etc/updater_sa.cfg | 2 ++ services/firmware/data/db/src/firmware_database_empty.cpp | 1 - 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/bundle.json b/bundle.json index 9df0c393..cb25fe55 100644 --- a/bundle.json +++ b/bundle.json @@ -29,7 +29,6 @@ "bounds_checking_function", "c_utils", "cJSON", - "common_event_service", "curl", "eventhandler", "hilog", @@ -37,7 +36,6 @@ "safwk", "samgr", "napi", - "startup_l2", "access_token", "hisysevent", "init", @@ -46,7 +44,6 @@ "mbedtls", "updater", "ability_base", - "ability_runtime", "netmanager_base", "openssl", "preferences", diff --git a/foundations/ability/sa_loader/include/base_service_kits_impl.h b/foundations/ability/sa_loader/include/base_service_kits_impl.h index 228707a0..c3e5ae02 100644 --- a/foundations/ability/sa_loader/include/base_service_kits_impl.h +++ b/foundations/ability/sa_loader/include/base_service_kits_impl.h @@ -124,9 +124,6 @@ template void BaseServiceKitsImpl::ResetService(cons } remoteServer_ = nullptr; deathRecipient_ = nullptr; - auto updateService = GetService(); //重新连接注册回调 - ENGINE_LOGI("Remote is dead, do ResetService, reconnect service %{public}s", - (updateService != nullptr) ? "success" : "fail"); } } #endif // BASE_SERVICE_KITS_IMPL_H diff --git a/foundations/ability/utils/include/json_builder.h b/foundations/ability/utils/include/json_builder.h index c00d28af..8e0161fe 100644 --- a/foundations/ability/utils/include/json_builder.h +++ b/foundations/ability/utils/include/json_builder.h @@ -73,7 +73,7 @@ public: if (!valueList.empty()) { JsonBuilder jsonArray; jsonArray.Append("["); - for (size_t i = 0; i < valueListSize; i++) { + for (std::vector::size_type i = 0; i < valueListSize; i++) { jsonArray.Append(valueList[i].ToJson()); if (i != valueListSize - 1) { jsonArray.Append(","); diff --git a/interfaces/inner_api/modulemgr/modulemgr.gni b/interfaces/inner_api/modulemgr/modulemgr.gni index c83cef7a..2540b9fc 100644 --- a/interfaces/inner_api/modulemgr/modulemgr.gni +++ b/interfaces/inner_api/modulemgr/modulemgr.gni @@ -24,19 +24,15 @@ modulemgr_external_deps = [ "safwk:system_ability_fwk", ] -modulemgr_deps = [] +modulemgr_deps = [ "$updateengine_root_path/foundations:update_foundations" ] modulemgr_public_deps = [] -modulemgr_include = [ - "$modulemgr_root_path/include", - "$updateengine_root_path/foundations/ability/log/include", -] +modulemgr_include = [ "$modulemgr_root_path/include" ] modulemgr_src = [ "$modulemgr_root_path/src/update_service_module.cpp", "$modulemgr_root_path/src/module_manager.cpp", - "$updateengine_root_path/foundations/ability/log/src/update_log.cpp", ] modulemgr_cflags = [ diff --git a/services/core/ability/common/include/constant.h b/services/core/ability/common/include/constant.h index 63191878..6df32e6d 100644 --- a/services/core/ability/common/include/constant.h +++ b/services/core/ability/common/include/constant.h @@ -36,7 +36,7 @@ static const std::string DUPDATE_ENGINE_CONFIG_PATH = "/system/etc/update/dupdat // 存放升级引擎数据库、缓存等文件的加密路径 static const std::string UPDATE_ENCRYPTED_ROOT_PATH = "/data/service/el1/public/update"; static const std::string DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/dupdate_engine"; -static const std::string DATABASES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/databases"; +static const std::string DATABASES_ROOT_PATH = UPDATE_ENCRYPTED_ROOT_PATH + "/update_service" + "/databases"; static const std::string PREFERENCES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/preferences"; static const std::string FILES_ROOT_PATH = DUPDATE_ENGINE_ENCRYPTED_ROOT_PATH + "/files"; diff --git a/services/engine/etc/updater_sa.cfg b/services/engine/etc/updater_sa.cfg index de4271cc..8e4ccd9a 100644 --- a/services/engine/etc/updater_sa.cfg +++ b/services/engine/etc/updater_sa.cfg @@ -9,6 +9,8 @@ "mkdir /data/service/el1/public/update/dupdate_engine/files 0700 update update", "mkdir /data/service/el1/public/update/dupdate_engine/files/firmware 0700 update update", "mkdir /data/service/el1/public/update/dupdate_engine/files/firmware/changelogs 0700 update update", + "mkdir /data/service/el1/public/update/update_service 0700 update update", + "mkdir /data/service/el1/public/update/update_service/databases 0700 update update", "mkdir /data/update 0770 update update", "mkdir /data/update/ota_package 0770 update update", "mkdir /data/update/ota_package/firmware 0770 update update", diff --git a/services/firmware/data/db/src/firmware_database_empty.cpp b/services/firmware/data/db/src/firmware_database_empty.cpp index 36621288..d10b6163 100644 --- a/services/firmware/data/db/src/firmware_database_empty.cpp +++ b/services/firmware/data/db/src/firmware_database_empty.cpp @@ -16,7 +16,6 @@ #include "firmware_database.h" #include "constant.h" -#include "update_log.h" namespace OHOS { namespace UpdateEngine { -- Gitee