From 1a68eb5e27072de04f51763c1052559a7c9a00a2 Mon Sep 17 00:00:00 2001
From: j21p3 <yanjun59@huawei.com>
Date: Thu, 24 Oct 2024 11:56:50 +0800
Subject: [PATCH] fix code alarm

Change-Id: I68a90fdd194d99201f798425005a0aa2139839ed
Signed-off-by: j21p3 <yanjun59@huawei.com>
---
 .../security_component_common/sec_comp_info_helper.h |  1 -
 .../sa/sa_main/sec_comp_perm_manager.cpp             | 12 +++++++-----
 .../sa/sa_main/sec_comp_perm_manager.h               |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/interfaces/inner_api/security_component_common/sec_comp_info_helper.h b/interfaces/inner_api/security_component_common/sec_comp_info_helper.h
index 08e7f18..fd3262e 100644
--- a/interfaces/inner_api/security_component_common/sec_comp_info_helper.h
+++ b/interfaces/inner_api/security_component_common/sec_comp_info_helper.h
@@ -43,7 +43,6 @@ public:
 private:
     static float GetWindowScale(int32_t windowId);
     static void AdjustSecCompRect(SecCompBase* comp, float scale);
-    static bool IsDlpSandboxCalling(AccessToken::AccessTokenID tokenId);
 };
 }  // namespace SecurityComponent
 }  // namespace Security
diff --git a/services/security_component_service/sa/sa_main/sec_comp_perm_manager.cpp b/services/security_component_service/sa/sa_main/sec_comp_perm_manager.cpp
index ee61225..9fd40aa 100644
--- a/services/security_component_service/sa/sa_main/sec_comp_perm_manager.cpp
+++ b/services/security_component_service/sa/sa_main/sec_comp_perm_manager.cpp
@@ -268,6 +268,13 @@ void SecCompPermManager::InitEventHandler(const std::shared_ptr<SecEventHandler>
     secHandler_ = secHandler;
 }
 
+namespace {
+inline bool IsDlpSandboxCalling(AccessToken::AccessTokenID tokenId)
+{
+    return AccessToken::AccessTokenKit::GetHapDlpFlag(tokenId) != 0;
+}
+}
+
 int32_t SecCompPermManager::GrantTempPermission(AccessToken::AccessTokenID tokenId,
     const std::shared_ptr<SecCompBase>& componentInfo)
 {
@@ -313,11 +320,6 @@ int32_t SecCompPermManager::GrantTempPermission(AccessToken::AccessTokenID token
     }
     return SC_SERVICE_ERROR_PERMISSION_OPER_FAIL;
 }
-
-inline bool SecCompPermManager::IsDlpSandboxCalling(AccessToken::AccessTokenID tokenId)
-{
-    return AccessToken::AccessTokenKit::GetHapDlpFlag(tokenId) != 0;
-}
 }  // namespace SecurityComponent
 }  // namespace Security
 }  // namespace OHOS
diff --git a/services/security_component_service/sa/sa_main/sec_comp_perm_manager.h b/services/security_component_service/sa/sa_main/sec_comp_perm_manager.h
index 356e297..aaa2817 100644
--- a/services/security_component_service/sa/sa_main/sec_comp_perm_manager.h
+++ b/services/security_component_service/sa/sa_main/sec_comp_perm_manager.h
@@ -59,7 +59,6 @@ private:
         const std::string& permissionName);
     void RemoveAppGrantPermissionRecord(AccessToken::AccessTokenID tokenId,
         const std::string& permissionName);
-    bool IsDlpSandboxCalling(AccessToken::AccessTokenID tokenId);
 
     std::unordered_map<AccessToken::AccessTokenID, int32_t> applySaveCountMap_;
     std::unordered_map<AccessToken::AccessTokenID, std::deque<std::string>> saveTaskDequeMap_;
-- 
Gitee