From 40fe0d403d455bedba338f963dee7ad798a02000 Mon Sep 17 00:00:00 2001 From: t00871417 Date: Tue, 12 Nov 2024 14:43:50 +0800 Subject: [PATCH] =?UTF-8?q?GET=5FETHERNET=5FLOCAL=5FMAC&GET=5FWIFI=5FLOCAL?= =?UTF-8?q?=5FMAC=E6=9D=83=E9=99=90=E5=88=86=E5=8F=91=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id9361b8b264f185e50a8dff9f88453fe8ceefc67 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