From 9c7662d4c0a8974c6c620eac12e9a43de617c630 Mon Sep 17 00:00:00 2001 From: wuzhijie Date: Wed, 11 Jun 2025 14:16:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=9D=E6=8A=A4=E5=86=85=E6=A0=B8=E7=AE=A1=E6=8E=A7=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuzhijie --- .../accesstokenmanager/permission_definitions.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/services/accesstokenmanager/permission_definitions.json b/services/accesstokenmanager/permission_definitions.json index e44c51215..c63bc676b 100644 --- a/services/accesstokenmanager/permission_definitions.json +++ b/services/accesstokenmanager/permission_definitions.json @@ -6848,6 +6848,17 @@ "provisionEnable": false, "distributedSceneEnable": false, "deviceTypes": ["general"] + }, + { + "name": "ohos.permission.kernel.CODE_PROTECT_MANAGE", + "grantMode": "system_grant", + "availableLevel": "system_core", + "availableType": "SYSTEM", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false, + "deviceTypes": ["general"] } ] } -- Gitee From 212bd17a3284b506ea051e91d74c84ae456cc7cb Mon Sep 17 00:00:00 2001 From: wuzhijie Date: Thu, 19 Jun 2025 18:01:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuzhijie --- services/accesstokenmanager/permission_definitions.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/accesstokenmanager/permission_definitions.json b/services/accesstokenmanager/permission_definitions.json index 84693578b..0319c1bfb 100644 --- a/services/accesstokenmanager/permission_definitions.json +++ b/services/accesstokenmanager/permission_definitions.json @@ -6939,11 +6939,6 @@ "deviceTypes": ["phone", "2in1", "tablet"] }, { -<<<<<<< HEAD - "name": "ohos.permission.kernel.CODE_PROTECT_MANAGE", - "grantMode": "system_grant", - "availableLevel": "system_core", -======= "name": "ohos.permission.FILE_ACCESS_FOR_PRIVATE_SPACE", "grantMode": "system_grant", "availableLevel": "system_basic", @@ -6958,7 +6953,6 @@ "name": "ohos.permission.ACCESS_DFX_LOG_DIR", "grantMode": "system_grant", "availableLevel": "system_basic", ->>>>>>> 699a4a9e4a3a8b031cb9dbee8b1a1c95fb129cae "availableType": "SYSTEM", "since": 20, "deprecated": "", -- Gitee From e43f217c124aa1634db779f9dac589b5ad9db1b7 Mon Sep 17 00:00:00 2001 From: wuzhijie Date: Thu, 19 Jun 2025 18:04:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=83=E9=99=90ohos.pe?= =?UTF-8?q?rmission.kernel.CODE=5FPROTECT=5FMANAGE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuzhijie --- .../accesstokenmanager/permission_definitions.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/services/accesstokenmanager/permission_definitions.json b/services/accesstokenmanager/permission_definitions.json index 0319c1bfb..a8e188de7 100644 --- a/services/accesstokenmanager/permission_definitions.json +++ b/services/accesstokenmanager/permission_definitions.json @@ -6970,6 +6970,18 @@ "provisionEnable": true, "distributedSceneEnable": false, "deviceTypes": ["wearable"] + }, + { + "name": "ohos.permission.kernel.CODE_PROTECT_MANAGE", + "grantMode": "system_grant", + "availableLevel": "system_core", + "availableType": "SYSTEM", + "since": 20, + "deprecated": "", + "provisionEnable": true, + "distributedSceneEnable": false, + "deviceTypes": ["general"], + "isKernelEffect": true } ] } -- Gitee