From 9dfd6584c97d8ef4bda9f0ae485fb111675922d0 Mon Sep 17 00:00:00 2001
From: lsq <linshuqing2@huawei.com>
Date: Mon, 20 Jun 2022 11:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E9=A2=91=E8=AE=BF=E9=97=AE=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=8E=BB=E6=8E=89=E6=AD=A3=E5=B8=B8=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lsq <linshuqing2@huawei.com>
Change-Id: I8b027edf3afd498bd213bfed533167ad3bbf3d51
Signed-off-by: lsq <linshuqing2@huawei.com>
---
 .../innerkits/accesstoken/src/accesstoken_kit.cpp    |  2 --
 .../accesstoken/src/accesstoken_manager_client.cpp   |  1 -
 .../accesstoken/src/accesstoken_manager_proxy.cpp    |  1 -
 .../main/cpp/src/permission/permission_manager.cpp   |  2 --
 .../cpp/src/service/accesstoken_manager_service.cpp  | 12 +++++++-----
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
index b8b99916b..e3ed61840 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp
@@ -154,7 +154,6 @@ PermissionOper AccessTokenKit::GetSelfPermissionsState(std::vector<PermissionLis
 
 int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName)
 {
-    ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called", __func__);
     if (tokenID == 0) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "tokenID is invalid");
         return PERMISSION_DENIED;
@@ -163,7 +162,6 @@ int AccessTokenKit::VerifyAccessToken(AccessTokenID tokenID, const std::string&
         ACCESSTOKEN_LOG_ERROR(LABEL, "permissionName is invalid");
         return PERMISSION_DENIED;
     }
-    ACCESSTOKEN_LOG_INFO(LABEL, "tokenID=%{public}d, permissionName=%{public}s", tokenID, permissionName.c_str());
     return AccessTokenManagerClient::GetInstance().VerifyAccessToken(tokenID, permissionName);
 }
 
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
index 855fe52ab..afc202b2f 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp
@@ -46,7 +46,6 @@ AccessTokenManagerClient::~AccessTokenManagerClient()
 
 int AccessTokenManagerClient::VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName)
 {
-    ACCESSTOKEN_LOG_DEBUG(LABEL, "%{public}s: called!", __func__);
     auto proxy = GetProxy();
     if (proxy == nullptr) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null");
diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
index 8e891aef2..71096d97b 100644
--- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
+++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp
@@ -62,7 +62,6 @@ int AccessTokenManagerProxy::VerifyAccessToken(AccessTokenID tokenID, const std:
     }
 
     int32_t result = reply.ReadInt32();
-    ACCESSTOKEN_LOG_DEBUG(LABEL, "result from server data = %{public}d", result);
     return result;
 }
 
diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
index 04c3947f1..a3903b52d 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp
@@ -138,8 +138,6 @@ int PermissionManager::VerifyNativeAccessToken(AccessTokenID tokenID, const std:
 
 int PermissionManager::VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName)
 {
-    ACCESSTOKEN_LOG_INFO(LABEL, "%{public}s called, tokenID: %{public}u, permissionName: %{public}s", __func__,
-        tokenID, permissionName.c_str());
     if (!PermissionValidator::IsPermissionNameValid(permissionName)) {
         ACCESSTOKEN_LOG_ERROR(LABEL, "invalid params!");
         return PERMISSION_DENIED;
diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
index 37ee9f47f..29dc2ad0c 100644
--- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
+++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp
@@ -88,15 +88,17 @@ void AccessTokenManagerService::OnStop()
 
 int AccessTokenManagerService::VerifyAccessToken(AccessTokenID tokenID, const std::string& permissionName)
 {
-    ACCESSTOKEN_LOG_INFO(LABEL, "called, tokenID: 0x%{public}x, permissionName: %{public}s",
-        tokenID, permissionName.c_str());
-    return PermissionManager::GetInstance().VerifyAccessToken(tokenID, permissionName);
+    int isGranted = PermissionManager::GetInstance().VerifyAccessToken(tokenID, permissionName);
+    if (isGranted != PERMISSION_GRANTED) {
+        PrivacyKit::AddPermissionUsedRecord(tokenID, permissionName, 0, 1);
+    } else {
+        PrivacyKit::AddPermissionUsedRecord(tokenID, permissionName, 1, 0);
+    }
+    return isGranted;
 }
 
 int AccessTokenManagerService::VerifyNativeToken(AccessTokenID tokenID, const std::string& permissionName)
 {
-    ACCESSTOKEN_LOG_INFO(LABEL, "called, tokenID: 0x%{public}x, permissionName: %{public}s",
-        tokenID, permissionName.c_str());
     return PermissionManager::GetInstance().VerifyNativeToken(tokenID, permissionName);
 }
 
-- 
Gitee