From 0f1e758bff1d47e32377ca69e2919a96a584d3a4 Mon Sep 17 00:00:00 2001 From: yinjiaming Date: Tue, 10 Sep 2024 16:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=91=8A=E8=AD=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E4=BF=AE=E6=94=B9=E4=BA=86=E5=87=A0=E5=A4=84?= =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yinjiaming Change-Id: Icfa80240ecc71453a45c61e43c51b039456c4c38 --- services/key_enable/utils/src/unlock_event_helper.cpp | 8 ++++---- test/unittest/utils/src/enable_key_utils.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/services/key_enable/utils/src/unlock_event_helper.cpp b/services/key_enable/utils/src/unlock_event_helper.cpp index 23d97a1..a71f4a7 100644 --- a/services/key_enable/utils/src/unlock_event_helper.cpp +++ b/services/key_enable/utils/src/unlock_event_helper.cpp @@ -27,8 +27,8 @@ namespace OHOS { namespace Security { namespace CodeSign { -constexpr int32_t SEELP_TIME_FOR_COMMON_EVENT_MGR = 500 * 1000; // 500 ms -constexpr int32_t SEELP_TIME_FOR_COMMON_EVENT_MGR_TIME_OUT = 10 * 60; // 10 min +constexpr int32_t SLEEP_TIME_FOR_COMMON_EVENT_MGR = 500 * 1000; // 500 ms +constexpr int32_t SLEEP_TIME_FOR_COMMON_EVENT_MGR_TIME_OUT = 10 * 60; // 10 min constexpr int32_t COMMON_EVENT_MANAGER_ID = 3299; void UnlockEventHelper::UnlockEventSubscriber::OnReceiveEvent(const EventFwk::CommonEventData& event) @@ -119,7 +119,7 @@ bool UnlockEventHelper::WaitForCommonEventManager() if (!OHOS::GetSystemCurrentTime(&startTime)) { return false; } - while (seconds <= SEELP_TIME_FOR_COMMON_EVENT_MGR_TIME_OUT) { + while (seconds <= SLEEP_TIME_FOR_COMMON_EVENT_MGR_TIME_OUT) { sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr != nullptr && samgr->CheckSystemAbility(COMMON_EVENT_MANAGER_ID) != nullptr) { @@ -128,7 +128,7 @@ bool UnlockEventHelper::WaitForCommonEventManager() break; } LOG_DEBUG(LABEL, "Get common event manager failed."); - usleep(SEELP_TIME_FOR_COMMON_EVENT_MGR); + usleep(SLEEP_TIME_FOR_COMMON_EVENT_MGR); if (OHOS::GetSystemCurrentTime(&doingTime)) { seconds = OHOS::GetSecondsBetween(startTime, doingTime); } diff --git a/test/unittest/utils/src/enable_key_utils.cpp b/test/unittest/utils/src/enable_key_utils.cpp index 42d3e80..91e52e0 100644 --- a/test/unittest/utils/src/enable_key_utils.cpp +++ b/test/unittest/utils/src/enable_key_utils.cpp @@ -20,8 +20,8 @@ namespace OHOS { namespace Security { namespace CodeSign { -constexpr int DEFUALT_CERT_CHAIN_LEN = 3; -constexpr int DEFUALT_CERT_PATH_TYPE = 0X103; +constexpr int DEFAULT_CERT_CHAIN_LEN = 3; +constexpr int DEFAULT_CERT_PATH_TYPE = 0X103; int32_t EnableTestKey(const char *signing, const char *issuer) { @@ -30,8 +30,8 @@ int32_t EnableTestKey(const char *signing, const char *issuer) arg.issuer = reinterpret_cast(issuer); arg.signing_length = strlen(signing) + 1; arg.issuer_length = strlen(issuer) + 1; - arg.path_len = DEFUALT_CERT_CHAIN_LEN; - arg.path_type = DEFUALT_CERT_PATH_TYPE; + arg.path_len = DEFAULT_CERT_CHAIN_LEN; + arg.path_type = DEFAULT_CERT_PATH_TYPE; return AddCertPath(arg); } } -- Gitee