From dac23dca488babe38f249a5350a37bc9ab632159 Mon Sep 17 00:00:00 2001
From: zhuofan0129 <861080528@qq.com>
Date: Mon, 18 Aug 2025 18:57:41 +0800
Subject: [PATCH] feat: improve DSLM_CALL_TIMER

Signed-off-by: zhuofan0129 <861080528@qq.com>
---
 .../device_security_level_callback_helper.cpp        | 12 ++----------
 .../standard/device_security_level_callback_helper.h |  1 -
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/interfaces/inner_api/src/standard/device_security_level_callback_helper.cpp b/interfaces/inner_api/src/standard/device_security_level_callback_helper.cpp
index 4b4538e..45ef8e9 100644
--- a/interfaces/inner_api/src/standard/device_security_level_callback_helper.cpp
+++ b/interfaces/inner_api/src/standard/device_security_level_callback_helper.cpp
@@ -34,8 +34,6 @@ namespace Security {
 namespace DeviceSecurityLevel {
 using namespace OHOS::HiviewDFX;
 
-constexpr char TIMER_NAME[] = "DSLM_CALL_TIMER";
-constexpr uint32_t KEEP_COMPENSATION_LEN = 5;
 constexpr uint32_t MAX_CALLBACKS_NUM = 128;
 
 DeviceSecurityLevelCallbackHelper::DeviceSecurityLevelCallbackHelper()
@@ -96,14 +94,12 @@ int32_t DeviceSecurityLevelCallbackHelper::OnRemoteRequest(uint32_t code, Messag
     return SUCCESS;
 }
 
-DeviceSecurityLevelCallbackHelper::CallbackInfoHolder::CallbackInfoHolder() : timer_(TIMER_NAME)
+DeviceSecurityLevelCallbackHelper::CallbackInfoHolder::CallbackInfoHolder()
 {
-    timer_.Setup();
 }
 
 DeviceSecurityLevelCallbackHelper::CallbackInfoHolder::~CallbackInfoHolder()
 {
-    timer_.Shutdown();
 }
 
 bool DeviceSecurityLevelCallbackHelper::CallbackInfoHolder::PushCallback(const DeviceIdentify &identity,
@@ -118,11 +114,6 @@ bool DeviceSecurityLevelCallbackHelper::CallbackInfoHolder::PushCallback(const D
     cookie = ++generate_;
     CallbackInfo info = {.identity = identity, .callback = callback, .cookie = cookie};
     auto result = map_.emplace(generate_, info);
-    if (result.second) {
-        auto deleter = [cookie, this]() { PopCallback(cookie, ERR_TIMEOUT, 0); };
-        keep += KEEP_COMPENSATION_LEN;
-        timer_.Register(deleter, keep * 1000, true); // 1000 millisec
-    }
     return result.second;
 }
 
@@ -154,6 +145,7 @@ bool DeviceSecurityLevelCallbackHelper::CallbackInfoHolder::PopCallback(uint32_t
 
     return true;
 }
+
 bool DeviceSecurityLevelCallbackHelper::CallbackInfoHolder::PopCallback(uint32_t cookie)
 {
     std::lock_guard<std::mutex> lock(mutex_);
diff --git a/interfaces/inner_api/src/standard/device_security_level_callback_helper.h b/interfaces/inner_api/src/standard/device_security_level_callback_helper.h
index 5cb41f2..7037bba 100644
--- a/interfaces/inner_api/src/standard/device_security_level_callback_helper.h
+++ b/interfaces/inner_api/src/standard/device_security_level_callback_helper.h
@@ -64,7 +64,6 @@ private:
         std::map<uint32_t, CallbackInfo> map_;
         uint32_t generate_ {0};
         std::mutex mutex_;
-        OHOS::Utils::Timer timer_;
     };
 
     int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option);
-- 
Gitee