From 22ec3c37c208b253e043c72666d77b04560913f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= <huangjiabao4@huawei.com>
Date: Tue, 3 Jun 2025 17:14:12 +0800
Subject: [PATCH 1/2] modify product adaption
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 黄嘉宝 <huangjiabao4@huawei.com>
---
 .../source/system_ability_manager_util.cpp    | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/services/samgr/native/source/system_ability_manager_util.cpp b/services/samgr/native/source/system_ability_manager_util.cpp
index 8b9cf16f..4a172f31 100644
--- a/services/samgr/native/source/system_ability_manager_util.cpp
+++ b/services/samgr/native/source/system_ability_manager_util.cpp
@@ -245,31 +245,36 @@ bool SamgrUtil::CheckPengLai()
 
 void SamgrUtil::GetFilesByPriority(const std::string& path, std::vector<std::string>& fileNames)
 {
+    std::map<std::string, std::string> fileNamesMap;
+    CfgFiles* filePaths = GetCfgFiles(path.c_str());
+    for (int i = 0; filePaths && i < MAX_CFG_POLICY_DIRS_CNT; i++) {
+        if (filePaths->paths[i] == nullptr) {
+            continue;
+        }
+        HILOGI("GetFilesByPriority filePaths : %{public}s!", filePaths->paths[i]);
+        std::vector<std::string> files;
+        GetDirFiles(filePaths->paths[i], files);
+        for (const auto& file : files) {
+            HILOGD("GetFilesByPriority file : %{public}s!", file.c_str());
+            fileNamesMap[fs::path(file).filename().string()] = file;
+        }
+    }
+    
     if (SamgrUtil::CheckPengLai()) {
         HILOGI("GetFilesByPriority penglai!");
+        std::vector<std::string> files;
         GetDirFiles(PENGLAI_PATH, fileNames);
-    } else {
-        std::map<std::string, std::string> fileNamesMap;
-        CfgFiles* filePaths = GetCfgFiles(path.c_str());
-        for (int i = 0; filePaths && i < MAX_CFG_POLICY_DIRS_CNT; i++) {
-            if (filePaths->paths[i] == nullptr) {
-                continue;
-            }
-            HILOGI("GetFilesByPriority filePaths : %{public}s!", filePaths->paths[i]);
-            std::vector<std::string> files;
-            GetDirFiles(filePaths->paths[i], files);
-            for (const auto& file : files) {
-                HILOGD("GetFilesByPriority file : %{public}s!", file.c_str());
-                fileNamesMap[fs::path(file).filename().string()] = file;
-            }
-        }
-
-        for (const auto& pair : fileNamesMap) {
-            HILOGD("GetFilesByPriority files : %{public}s!", pair.second.c_str());
-            fileNames.push_back(pair.second);
+        for (const auto& file : files) {
+            HILOGD("GetFilesByPriority file : %{public}s!", file.c_str());
+            fileNamesMap[fs::path(file).filename().string()] = file;
         }
+    }
 
-        FreeCfgFiles(filePaths);
+    for (const auto& pair : fileNamesMap) {
+        HILOGD("GetFilesByPriority files : %{public}s!", pair.second.c_str());
+        fileNames.push_back(pair.second);
     }
+
+    FreeCfgFiles(filePaths);
 }
 }
-- 
Gitee


From 50f79ae97396b1461eb24fe86729c99005357379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= <huangjiabao4@huawei.com>
Date: Tue, 3 Jun 2025 17:22:30 +0800
Subject: [PATCH 2/2] modify product adaption
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 黄嘉宝 <huangjiabao4@huawei.com>
---
 services/samgr/native/source/system_ability_manager_util.cpp | 2 +-
 1 file changed, 1 insertion(+), 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 4a172f31..1aee6a95 100644
--- a/services/samgr/native/source/system_ability_manager_util.cpp
+++ b/services/samgr/native/source/system_ability_manager_util.cpp
@@ -263,7 +263,7 @@ void SamgrUtil::GetFilesByPriority(const std::string& path, std::vector<std::str
     if (SamgrUtil::CheckPengLai()) {
         HILOGI("GetFilesByPriority penglai!");
         std::vector<std::string> files;
-        GetDirFiles(PENGLAI_PATH, fileNames);
+        GetDirFiles(PENGLAI_PATH, files);
         for (const auto& file : files) {
             HILOGD("GetFilesByPriority file : %{public}s!", file.c_str());
             fileNamesMap[fs::path(file).filename().string()] = file;
-- 
Gitee