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 08e7f18a33c21cf718836b9a2ba6d314112026bb..fd3262e4f1e2114c2b213210fcb37954a7f960ef 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 ee612258dcc1d6f0c23bb4195614d9f2a6dd799f..9fd40aa63dd77b66872a15b834297f6c5186607a 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 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& 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 356e29781e0d06b84f6578c289934251ca7af0a3..aaa2817697cfa832ff7ccf0f1083fecd9901e442 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 applySaveCountMap_; std::unordered_map> saveTaskDequeMap_;