From bd0805083bfdd4833822bc0e63cf788381519141 Mon Sep 17 00:00:00 2001 From: xia-bubai Date: Sat, 10 May 2025 13:44:26 +0800 Subject: [PATCH] modify max perm num from 1000 to 1024 Signed-off-by: xia-bubai --- .../innerkits/accesstoken/src/accesstoken_manager_client.cpp | 2 +- .../PermisionDialogTest/get_self_permission_state_test.cpp | 2 +- .../main/cpp/src/service/accesstoken_manager_service.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp index cc2de1369..1b2387926 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp @@ -36,7 +36,7 @@ static constexpr int32_t VALUE_MAX_LEN = 32; static const char* ACCESS_TOKEN_SERVICE_INIT_KEY = "accesstoken.permission.init"; std::recursive_mutex g_instanceMutex; static const int32_t SA_ID_ACCESSTOKEN_MANAGER_SERVICE = 3503; -static const int MAX_PERMISSION_SIZE = 1000; +static const int MAX_PERMISSION_SIZE = 1024; static const int32_t MAX_USER_POLICY_SIZE = 1024; static const int32_t MAX_EXTENDED_VALUE_LIST_SIZE = 512; } // namespace diff --git a/interfaces/innerkits/accesstoken/test/unittest/PermisionDialogTest/get_self_permission_state_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/PermisionDialogTest/get_self_permission_state_test.cpp index e183d7961..c8e47b449 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/PermisionDialogTest/get_self_permission_state_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/PermisionDialogTest/get_self_permission_state_test.cpp @@ -22,7 +22,7 @@ namespace Security { namespace AccessToken { using namespace testing::ext; namespace { -static const int MAX_PERMISSION_SIZE = 1000; +static const int MAX_PERMISSION_SIZE = 1024; static const std::string TEST_BUNDLE_NAME = "ohos"; static const int TEST_USER_ID = 0; static const std::string LOCATION_PERMISSION = "ohos.permission.LOCATION"; diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp index ccdf0fff3..6c01fa72c 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp @@ -70,7 +70,7 @@ const char* APPLICATION_SETTING_ABILITY_NAME = "com.ohos.permissionmanager.MainA const char* DEVELOPER_MODE_STATE = "const.security.developermode.state"; const std::string MANAGE_HAP_TOKENID_PERMISSION = "ohos.permission.MANAGE_HAP_TOKENID"; -static constexpr int MAX_PERMISSION_SIZE = 1000; +static constexpr int MAX_PERMISSION_SIZE = 1024; static constexpr int32_t MAX_USER_POLICY_SIZE = 1024; const std::string GRANT_SENSITIVE_PERMISSIONS = "ohos.permission.GRANT_SENSITIVE_PERMISSIONS"; const std::string REVOKE_SENSITIVE_PERMISSIONS = "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"; @@ -298,7 +298,7 @@ int32_t AccessTokenManagerService::GetPermissionsStatus(AccessTokenID tokenID, uint32_t size = reqPermList.size(); if (size > MAX_PERMISSION_SIZE) { LOGE(ATM_DOMAIN, ATM_TAG, "PermList size %{public}d is invalid", size); - return INVALID_OPER; + return AccessTokenError::ERR_PARAM_INVALID; } if (!AccessTokenInfoManager::GetInstance().IsTokenIdExist(tokenID)) { -- Gitee