From 18189ef4a4e5cf65198c267f6638a383ef722659 Mon Sep 17 00:00:00 2001 From: hunili Date: Wed, 5 Jun 2024 22:23:14 +0800 Subject: [PATCH] Just add issue: https://gitee.com/openharmony/filemanagement_app_file_service/issues/I9VIB9 Signed-off-by: hunili --- .../native/backup_ext/src/ext_backup_context.cpp | 2 +- utils/include/b_resources/b_constants.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frameworks/native/backup_ext/src/ext_backup_context.cpp b/frameworks/native/backup_ext/src/ext_backup_context.cpp index 06e9c69c6..87a8a03dd 100644 --- a/frameworks/native/backup_ext/src/ext_backup_context.cpp +++ b/frameworks/native/backup_ext/src/ext_backup_context.cpp @@ -25,6 +25,6 @@ const std::string ExtBackupContext::GetBackupDir() return ""; } return std::string(BConstants::BACKUP_DIR_PRE) + std::string(BConstants::CONTEXT_ELS[area]) + - std::string(BConstants::SA_BUNDLE_BACKUP_BACKUP); + std::string(BConstants::BACKUP_DIR_END); } } // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/utils/include/b_resources/b_constants.h b/utils/include/b_resources/b_constants.h index 487e73313..27b5c92ac 100644 --- a/utils/include/b_resources/b_constants.h +++ b/utils/include/b_resources/b_constants.h @@ -96,15 +96,15 @@ static inline std::string_view SA_BUNDLE_BACKUP_BACKUP = "/backup/"; static inline std::string_view SA_BUNDLE_BACKUP_RESTORE = "/restore/"; static inline std::string_view SA_BUNDLE_BACKUP_TMP_DIR = "/tmp/"; static inline std::string_view BACKUP_TOOL_RECEIVE_DIR = "/data/backup/received/"; -static inline std::string_view PATH_BUNDLE_BACKUP_HOME_EL1 = "/data/storage/el1/backup"; -static inline std::string_view PATH_BUNDLE_BACKUP_HOME = "/data/storage/el2/backup"; +static inline std::string_view PATH_BUNDLE_BACKUP_HOME_EL1 = "/data/storage/el1/base/.backup"; +static inline std::string_view PATH_BUNDLE_BACKUP_HOME = "/data/storage/el2/base/.backup"; static inline std::string_view BACKUP_TOOL_LINK_DIR = "/data/backup"; static inline std::string_view BACKUP_TOOL_INCREMENTAL_RECEIVE_DIR = "/data/backup/incrementalreceived/"; static inline std::string_view BACKUP_TOOL_MANIFEST = "/manifest"; static inline std::string_view BACKUP_TOOL_INCREMENTAL = "/incremental"; static inline std::string BACKUP_DIR_PRE = "/data/storage/"; static inline std::string CONTEXT_ELS[] = {"el1", "el2"}; - +static inline std::string BACKUP_DIR_END = "/base/.backup/"; // SA Ext constexpr int BACKUP_DEFAULT_SA_ID = -1; constexpr int BACKUP_SA_RELOAD_MAX = 2; @@ -115,9 +115,9 @@ static inline std::string EXTENSION_RESTORE = "restore"; static inline std::string GetSaBundleBackupDir(int32_t userId) { std::string str; - str.append("/data/service/el2/"); + str.append("/data/app/el2/"); str.append(std::to_string(userId)); - str.append("/backup/bundles/"); + str.append("/base/.backup/"); return str; } -- Gitee