From 622fb15d9ea0629ea4f2b07e240a158fb9d44498 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Tue, 29 Nov 2022 18:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AE=9A=E4=B9=89=E8=A1=A5?= =?UTF-8?q?=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: y1585740638 Change-Id: Idd9ea8e975562d4c04134661fbc4b279a2a7d669 --- .../privacymanager/include/common/constant.h | 23 +++++++++++++------ .../privacymanager/src/common/constant.cpp | 11 +++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/services/privacymanager/include/common/constant.h b/services/privacymanager/include/common/constant.h index 6e3602ac6..8a9c88c2b 100644 --- a/services/privacymanager/include/common/constant.h +++ b/services/privacymanager/include/common/constant.h @@ -43,13 +43,22 @@ public: OP_LOCATION_IN_BACKGROUND = 14, OP_LOCATION = 15, OP_MEDIA_LOCATION = 16, - OP_CAMERA = 17, - OP_READ_MEDIA = 18, - OP_WRITE_MEDIA = 19, - OP_ACTIVITY_MOTION = 20, - OP_READ_HEALTH_DATA = 21, - OP_MANAGE_VOICEMAIL = 22, - OP_DISTRIBUTED_DATASYNC = 23, + OP_APPROXIMATELY_LOCATION = 17, + OP_CAMERA = 18, + OP_READ_MEDIA = 19, + OP_WRITE_MEDIA = 20, + OP_ACTIVITY_MOTION = 21, + OP_READ_HEALTH_DATA = 22, + OP_MANAGE_VOICEMAIL = 23, + OP_DISTRIBUTED_DATASYNC = 24, + OP_READ_IMAGEVIDEO = 25, + OP_READ_AUDIO = 26, + OP_READ_DOCUMENT = 27, + OP_WRITE_IMAGEVIDEO = 28, + OP_WRITE_AUDIO = 29, + OP_WRITE_DOCUMENT = 30, + OP_READ_WHOLE_CALENDAR = 31, + OP_WRITE_WHOLE_CALENDAR = 32, }; enum ErrorCode { diff --git a/services/privacymanager/src/common/constant.cpp b/services/privacymanager/src/common/constant.cpp index 34fda467f..1c09bc491 100644 --- a/services/privacymanager/src/common/constant.cpp +++ b/services/privacymanager/src/common/constant.cpp @@ -38,6 +38,8 @@ const std::map Constant::PERMISSION_OPCODE_MAP = { "ohos.permission.LOCATION_IN_BACKGROUND", Constant::OP_LOCATION_IN_BACKGROUND), std::map::value_type("ohos.permission.LOCATION", Constant::OP_LOCATION), std::map::value_type("ohos.permission.MEDIA_LOCATION", Constant::OP_MEDIA_LOCATION), + std::map::value_type( + "ohos.permission.APPROXIMATELY_LOCATION", Constant::OP_APPROXIMATELY_LOCATION), std::map::value_type("ohos.permission.CAMERA", Constant::OP_CAMERA), std::map::value_type("ohos.permission.READ_MEDIA", Constant::OP_READ_MEDIA), std::map::value_type("ohos.permission.WRITE_MEDIA", Constant::OP_WRITE_MEDIA), @@ -46,6 +48,15 @@ const std::map Constant::PERMISSION_OPCODE_MAP = { std::map::value_type("ohos.permission.MANAGE_VOICEMAIL", Constant::OP_MANAGE_VOICEMAIL), std::map::value_type( "ohos.permission.DISTRIBUTED_DATASYNC", Constant::OP_DISTRIBUTED_DATASYNC), + std::map::value_type("ohos.permission.READ_IMAGEVIDEO", Constant::OP_READ_IMAGEVIDEO), + std::map::value_type("ohos.permission.READ_AUDIO", Constant::OP_READ_AUDIO), + std::map::value_type("ohos.permission.READ_DOCUMENT", Constant::OP_READ_DOCUMENT), + std::map::value_type("ohos.permission.WRITE_IMAGEVIDEO", Constant::OP_WRITE_IMAGEVIDEO), + std::map::value_type("ohos.permission.WRITE_AUDIO", Constant::OP_WRITE_AUDIO), + std::map::value_type("ohos.permission.WRITE_DOCUMENT", Constant::OP_WRITE_DOCUMENT), + std::map::value_type("ohos.permission.READ_WHOLE_CALENDAR", Constant::OP_READ_WHOLE_CALENDAR), + std::map::value_type( + "ohos.permission.WRITE_WHOLE_CALENDAR", Constant::OP_WRITE_WHOLE_CALENDAR), }; bool Constant::TransferPermissionToOpcode(const std::string& permissionName, int32_t& opCode)