From 7acabf0dd1476fe4cdf83dfb1ae80a7d09f6fc9e Mon Sep 17 00:00:00 2001 From: t00871417 Date: Thu, 14 Nov 2024 09:28:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EENTERPRISE=5FNORMAL=E5=88=86?= =?UTF-8?q?=E5=8F=91=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id409afa03da7e0fd5321c74f81b9bef1d468c8cd Signed-off-by: t00871417 --- interfaces/innerkits/accesstoken/include/access_token.h | 1 + .../main/cpp/src/permission/permission_definition_parser.cpp | 5 +++++ services/accesstokenmanager/permission_definitions.json | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/innerkits/accesstoken/include/access_token.h index 2043b57ae..f1814187a 100644 --- a/interfaces/innerkits/accesstoken/include/access_token.h +++ b/interfaces/innerkits/accesstoken/include/access_token.h @@ -128,6 +128,7 @@ typedef enum TypeATokenAvailableTypeEnum { SYSTEM_AND_MDM, SERVICE, AVAILABLE_TYPE_BUTT, + ENTERPRISE_NORMAL, } ATokenAvailableTypeEnum; /** diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp index 4dd1ed410..b33ff436c 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_definition_parser.cpp @@ -50,6 +50,7 @@ static const std::string AVAILABLE_TYPE_SYSTEM_HAP = "SYSTEM"; static const std::string AVAILABLE_TYPE_MDM = "MDM"; static const std::string AVAILABLE_TYPE_SYSTEM_AND_MDM = "SYSTEM_AND_MDM"; static const std::string AVAILABLE_TYPE_SERVICE = "SERVICE"; +static const std::string AVAILABLE_TYPE_ENTERPRISE_NORMAL = "ENTERPRISE_NORMAL"; static const std::string AVAILABLE_LEVEL_NORMAL = "normal"; static const std::string AVAILABLE_LEVEL_SYSTEM_BASIC = "system_basic"; static const std::string AVAILABLE_LEVEL_SYSTEM_CORE = "system_core"; @@ -102,6 +103,10 @@ static bool GetPermissionAvailableType(const std::string &availableType, AccessT typeNum = AccessToken::ATokenAvailableTypeEnum::SERVICE; return true; } + if (availableType == AVAILABLE_TYPE_ENTERPRISE_NORMAL) { + typeNum = AccessToken::ATokenAvailableTypeEnum::ENTERPRISE_NORMAL; + return true; + } typeNum = AccessToken::ATokenAvailableTypeEnum::INVALID; ACCESSTOKEN_LOG_ERROR(LABEL, "AvailableType: %{public}s is invalid.", availableType.c_str()); return false; diff --git a/services/accesstokenmanager/permission_definitions.json b/services/accesstokenmanager/permission_definitions.json index 50381a72b..5e61a496b 100644 --- a/services/accesstokenmanager/permission_definitions.json +++ b/services/accesstokenmanager/permission_definitions.json @@ -814,7 +814,7 @@ "name": "ohos.permission.GET_WIFI_LOCAL_MAC", "grantMode": "system_grant", "availableLevel": "system_basic", - "availableType": "SYSTEM", + "availableType": "ENTERPRISE_NORMAL", "since": 8, "deprecated": "", "provisionEnable": true, @@ -5130,7 +5130,7 @@ "name": "ohos.permission.GET_ETHERNET_LOCAL_MAC", "grantMode": "system_grant", "availableLevel": "system_basic", - "availableType": "SYSTEM", + "availableType": "ENTERPRISE_NORMAL", "since": 13, "deprecated": "", "provisionEnable": true, -- Gitee