From 38e153cc2acbb83eda08b2e785607bec471155ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Wed, 4 Jun 2025 19:16:53 +0800 Subject: [PATCH 1/3] modify mode path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- services/samgr/native/include/system_ability_manager_util.h | 1 + 1 file changed, 1 insertion(+) diff --git a/services/samgr/native/include/system_ability_manager_util.h b/services/samgr/native/include/system_ability_manager_util.h index 86272369..05eca9fa 100644 --- a/services/samgr/native/include/system_ability_manager_util.h +++ b/services/samgr/native/include/system_ability_manager_util.h @@ -49,6 +49,7 @@ public: static void FilterCommonSaProfile(const SaProfile& oldProfile, CommonSaProfile& newProfile); static bool CheckPengLai(); static void GetFilesByPriority(const std::string& path, std::vector& files); + static void GetFilesFromPath(const std::string& path, std::map& fileNamesMap); private: static std::shared_ptr setParmHandler_; }; -- Gitee From d4f3fa7ca41d9b67d645273f14d57acb891d8aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Wed, 4 Jun 2025 19:17:11 +0800 Subject: [PATCH 2/3] modify mode path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../source/system_ability_manager_util.cpp | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/services/samgr/native/source/system_ability_manager_util.cpp b/services/samgr/native/source/system_ability_manager_util.cpp index 1aee6a95..dedffdc1 100644 --- a/services/samgr/native/source/system_ability_manager_util.cpp +++ b/services/samgr/native/source/system_ability_manager_util.cpp @@ -40,7 +40,7 @@ constexpr const char* EVENT_EXTRA_DATA_ID = "extraDataId"; constexpr const char* MODULE_UPDATE_PARAM = "persist.samgr.moduleupdate"; constexpr const char* PENG_LAI_PARAM = "ohos.boot.minisys.mode"; constexpr const char* PENG_LAI = "penglai"; -constexpr const char* PENGLAI_PATH = "/sys_prod/profile/penglai"; +constexpr const char* PENGLAI_PATH = "profile/penglai"; std::shared_ptr SamgrUtil::setParmHandler_ = make_shared("setParmHandler"); bool SamgrUtil::IsNameInValid(const std::u16string& name) @@ -243,9 +243,8 @@ bool SamgrUtil::CheckPengLai() return paramValue == PENG_LAI; } -void SamgrUtil::GetFilesByPriority(const std::string& path, std::vector& fileNames) +void SamgrUtil::GetFilesFromPath(const std::string& path, std::map& fileNamesMap) { - std::map fileNamesMap; CfgFiles* filePaths = GetCfgFiles(path.c_str()); for (int i = 0; filePaths && i < MAX_CFG_POLICY_DIRS_CNT; i++) { if (filePaths->paths[i] == nullptr) { @@ -259,15 +258,19 @@ void SamgrUtil::GetFilesByPriority(const std::string& path, std::vector& fileNames) +{ + std::map fileNamesMap; + GetFilesFromPath(path, fileNamesMap); if (SamgrUtil::CheckPengLai()) { HILOGI("GetFilesByPriority penglai!"); - std::vector files; - GetDirFiles(PENGLAI_PATH, files); - for (const auto& file : files) { - HILOGD("GetFilesByPriority file : %{public}s!", file.c_str()); - fileNamesMap[fs::path(file).filename().string()] = file; - } + GetFilesFromPath(PENGLAI_PATH, fileNamesMap); } for (const auto& pair : fileNamesMap) { @@ -275,6 +278,5 @@ void SamgrUtil::GetFilesByPriority(const std::string& path, std::vector Date: Wed, 4 Jun 2025 19:27:20 +0800 Subject: [PATCH 3/3] modify mode path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- services/samgr/native/source/system_ability_manager_util.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/samgr/native/source/system_ability_manager_util.cpp b/services/samgr/native/source/system_ability_manager_util.cpp index dedffdc1..0fbbbbad 100644 --- a/services/samgr/native/source/system_ability_manager_util.cpp +++ b/services/samgr/native/source/system_ability_manager_util.cpp @@ -277,6 +277,5 @@ void SamgrUtil::GetFilesByPriority(const std::string& path, std::vector