From c352f338854002461b2bff98ae8b8bd5e69c56ed Mon Sep 17 00:00:00 2001 From: feibuzhid Date: Wed, 28 May 2025 11:35:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: feibuzhid --- services/privacymanager/privacy.cfg | 4 ++++ .../src/service/privacy_manager_service.cpp | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/services/privacymanager/privacy.cfg b/services/privacymanager/privacy.cfg index d7b26ab00..861389e2a 100644 --- a/services/privacymanager/privacy.cfg +++ b/services/privacymanager/privacy.cfg @@ -18,10 +18,14 @@ "ohos.permission.MICROPHONE_CONTROL", "ohos.permission.MANAGE_LOCAL_ACCOUNTS", "ohos.permission.SET_SUPER_PRIVACY", + “ohos.permission.PERMISSION_RECORD_TOGGLE", + “ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", "ohos.permission.MANAGE_SECURE_SETTINGS" ], "permission_acls" : [ "ohos.permission.MANAGE_DISPOSED_APP_STATUS", + “ohos.permission.PERMISSION_RECORD_TOGGLE", + “ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", "ohos.permission.CAMERA_CONTROL", "ohos.permission.MICROPHONE_CONTROL", "ohos.permission.SET_SUPER_PRIVACY" diff --git a/services/privacymanager/src/service/privacy_manager_service.cpp b/services/privacymanager/src/service/privacy_manager_service.cpp index 75887d9b8..d9902374e 100644 --- a/services/privacymanager/src/service/privacy_manager_service.cpp +++ b/services/privacymanager/src/service/privacy_manager_service.cpp @@ -128,10 +128,6 @@ int32_t PrivacyManagerService::SetPermissionUsedRecordToggleStatus(int32_t userI if (!IsPrivilegedCalling() && !VerifyPermission(PERMISSION_RECORD_TOGGLE)) { return PrivacyError::ERR_PERMISSION_DENIED; } - if (userID != 0 && !IsPrivilegedCalling()) { - LOGE(PRI_DOMAIN, PRI_TAG, "User version only get calling userID."); - return PrivacyError::ERR_PERMISSION_DENIED; - } LOGI(PRI_DOMAIN, PRI_TAG, "userID: %{public}d, status: %{public}d", userID, status ? 1 : 0); return PermissionRecordManager::GetInstance().SetPermissionUsedRecordToggleStatus(userID, status); @@ -146,10 +142,6 @@ int32_t PrivacyManagerService::GetPermissionUsedRecordToggleStatus(int32_t userI if (!IsPrivilegedCalling() && !VerifyPermission(PERMISSION_USED_STATS)) { return PrivacyError::ERR_PERMISSION_DENIED; } - if (userID != 0 && !IsPrivilegedCalling()) { - LOGE(PRI_DOMAIN, PRI_TAG, "User version only get calling userID."); - return PrivacyError::ERR_PERMISSION_DENIED; - } LOGD(PRI_DOMAIN, PRI_TAG, "userID: %{public}d, status: %{public}d", userID, status ? 1 : 0); return PermissionRecordManager::GetInstance().GetPermissionUsedRecordToggleStatus(userID, status); -- Gitee From cd2bc15b286c4da93d277a0992883837adc32e44 Mon Sep 17 00:00:00 2001 From: feibuzhid Date: Wed, 28 May 2025 14:18:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9A=90=E7=A7=81=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: feibuzhid --- services/privacymanager/privacy.cfg | 4 ++++ .../src/service/privacy_manager_service.cpp | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/services/privacymanager/privacy.cfg b/services/privacymanager/privacy.cfg index d7b26ab00..ac1fb491e 100644 --- a/services/privacymanager/privacy.cfg +++ b/services/privacymanager/privacy.cfg @@ -18,10 +18,14 @@ "ohos.permission.MICROPHONE_CONTROL", "ohos.permission.MANAGE_LOCAL_ACCOUNTS", "ohos.permission.SET_SUPER_PRIVACY", + “ohos.permission.PERMISSION_RECORD_TOGGLE", + “ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", "ohos.permission.MANAGE_SECURE_SETTINGS" ], "permission_acls" : [ "ohos.permission.MANAGE_DISPOSED_APP_STATUS", + “ohos.permission.PERMISSION_RECORD_TOGGLE", + “ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", "ohos.permission.CAMERA_CONTROL", "ohos.permission.MICROPHONE_CONTROL", "ohos.permission.SET_SUPER_PRIVACY" diff --git a/services/privacymanager/src/service/privacy_manager_service.cpp b/services/privacymanager/src/service/privacy_manager_service.cpp index 75887d9b8..d9902374e 100644 --- a/services/privacymanager/src/service/privacy_manager_service.cpp +++ b/services/privacymanager/src/service/privacy_manager_service.cpp @@ -128,10 +128,6 @@ int32_t PrivacyManagerService::SetPermissionUsedRecordToggleStatus(int32_t userI if (!IsPrivilegedCalling() && !VerifyPermission(PERMISSION_RECORD_TOGGLE)) { return PrivacyError::ERR_PERMISSION_DENIED; } - if (userID != 0 && !IsPrivilegedCalling()) { - LOGE(PRI_DOMAIN, PRI_TAG, "User version only get calling userID."); - return PrivacyError::ERR_PERMISSION_DENIED; - } LOGI(PRI_DOMAIN, PRI_TAG, "userID: %{public}d, status: %{public}d", userID, status ? 1 : 0); return PermissionRecordManager::GetInstance().SetPermissionUsedRecordToggleStatus(userID, status); @@ -146,10 +142,6 @@ int32_t PrivacyManagerService::GetPermissionUsedRecordToggleStatus(int32_t userI if (!IsPrivilegedCalling() && !VerifyPermission(PERMISSION_USED_STATS)) { return PrivacyError::ERR_PERMISSION_DENIED; } - if (userID != 0 && !IsPrivilegedCalling()) { - LOGE(PRI_DOMAIN, PRI_TAG, "User version only get calling userID."); - return PrivacyError::ERR_PERMISSION_DENIED; - } LOGD(PRI_DOMAIN, PRI_TAG, "userID: %{public}d, status: %{public}d", userID, status ? 1 : 0); return PermissionRecordManager::GetInstance().GetPermissionUsedRecordToggleStatus(userID, status); -- Gitee From d07c3777d4c84426d7bc96d4fd92fc84408d339f Mon Sep 17 00:00:00 2001 From: aucharlin Date: Wed, 28 May 2025 08:26:29 +0000 Subject: [PATCH 3/3] update services/privacymanager/privacy.cfg. Signed-off-by: aucharlin --- services/privacymanager/privacy.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/privacymanager/privacy.cfg b/services/privacymanager/privacy.cfg index ac1fb491e..6e2b3753f 100644 --- a/services/privacymanager/privacy.cfg +++ b/services/privacymanager/privacy.cfg @@ -18,14 +18,14 @@ "ohos.permission.MICROPHONE_CONTROL", "ohos.permission.MANAGE_LOCAL_ACCOUNTS", "ohos.permission.SET_SUPER_PRIVACY", - “ohos.permission.PERMISSION_RECORD_TOGGLE", - “ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", + "ohos.permission.PERMISSION_RECORD_TOGGLE", + "ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", "ohos.permission.MANAGE_SECURE_SETTINGS" ], "permission_acls" : [ "ohos.permission.MANAGE_DISPOSED_APP_STATUS", - “ohos.permission.PERMISSION_RECORD_TOGGLE", - “ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", + "ohos.permission.PERMISSION_RECORD_TOGGLE", + "ohos.permission.USE_SECURITY_PRIVACY_MESSAGER", "ohos.permission.CAMERA_CONTROL", "ohos.permission.MICROPHONE_CONTROL", "ohos.permission.SET_SUPER_PRIVACY" -- Gitee