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 4b4538ebe404039fd2b1831880011f28754569c8..45ef8e9249eceb6c1754b9ee44864d9015c11279 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 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 5cb41f2be0174c93efc1429863e995183146fc31..7037bba280487ab456f92bbf190354d3c0e1a258 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 map_; uint32_t generate_ {0}; std::mutex mutex_; - OHOS::Utils::Timer timer_; }; int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option);