From 24f29a628e38b51b58d127eb8d0e94e3e4cede96 Mon Sep 17 00:00:00 2001
From: chennian <chennian1@huawei.com>
Date: Sat, 6 Sep 2025 17:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: chennian <chennian1@huawei.com>
Change-Id: I37957b52a4238a9c933649b9705b615dde954b79
---
 .../main/cpp/src/permission/short_grant_manager.cpp          | 3 +--
 .../main/cpp/src/token/token_modify_notifier.cpp             | 5 +----
 .../test/database_dlopen/database_dlopen_coverage_test.cpp   | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp
index a3b23b5ef..5317211e4 100644
--- a/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp
+++ b/services/accesstokenmanager/main/cpp/src/permission/short_grant_manager.cpp
@@ -142,7 +142,6 @@ int ShortGrantManager::RefreshPermission(AccessTokenID tokenID, const std::strin
         shortGrantData_.begin(), shortGrantData_.end(), [tokenID, permission](const PermTimerData& data) {
         return data.tokenID == tokenID && data.permissionName == permission;
     });
-
     if (iter == shortGrantData_.end()) {
         auto iterator = std::find(g_shortGrantPermission.begin(), g_shortGrantPermission.end(), permission);
         if (iterator == g_shortGrantPermission.end()) {
@@ -251,7 +250,7 @@ void ShortGrantManager::ScheduleRevokeTask(AccessTokenID tokenID, const std::str
         LOGI(ATM_DOMAIN, ATM_TAG,
             "Token: %{public}d, permission: %{public}s, delay revoke permission end.", tokenID, permission.c_str());
     });
-    LOGI(ATM_DOMAIN, ATM_TAG, "cancelTimes %{public}d", cancelTimes);
+    LOGI(ATM_DOMAIN, ATM_TAG, "CancelTimes %{public}d.", cancelTimes);
     eventHandler->ProxyPostTask(delayed, taskName, cancelTimes * 1000); // 1000 means to ms
     return;
 #else
diff --git a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
index e4b74f2e7..ac7206df2 100644
--- a/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
+++ b/services/accesstokenmanager/main/cpp/src/token/token_modify_notifier.cpp
@@ -175,11 +175,8 @@ int32_t TokenModifyNotifier::GetRemoteHapTokenInfo(const std::string& deviceID,
 int32_t TokenModifyNotifier::RegisterTokenSyncCallback(const sptr<IRemoteObject>& callback)
 {
     Utils::UniqueWriteGuard<Utils::RWLock> infoGuard(this->notifyLock_);
-    tokenSyncCallbackObject_ = new (std::nothrow) TokenSyncCallbackProxy(callback);
+    tokenSyncCallbackObject_ = new TokenSyncCallbackProxy(callback);
     tokenSyncCallbackDeathRecipient_ = sptr<TokenSyncCallbackDeathRecipient>::MakeSptr();
-    if (tokenSyncCallbackDeathRecipient_ == nullptr) {
-        return RET_FAILED;
-    }
     callback->AddDeathRecipient(tokenSyncCallbackDeathRecipient_);
     LOGI(ATM_DOMAIN, ATM_TAG, "Register token sync callback successful.");
     return ERR_OK;
diff --git a/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp b/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp
index ea42a0154..9838e8484 100644
--- a/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp
+++ b/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp
@@ -28,7 +28,6 @@ namespace Security {
 namespace AccessToken {
 namespace {
 constexpr const int32_t WAIT_EVENTHANDLE_TIME = 2;
-constexpr const int32_t WAIT_DELAY_DLCLOSE_TIME = 7;
 }
 class AccessTokenDatabaseDlopenTest : public testing::Test {
 public:
-- 
Gitee