From 9b9bf6eeaf26a72af7ab932b7c96b034eac0d364 Mon Sep 17 00:00:00 2001
From: li_junsong <lijunsong4@huawei.com>
Date: Wed, 5 Feb 2025 17:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=97=B6=E9=97=B4=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: li_junsong <lijunsong4@huawei.com>
---
 services/timer/src/timer_manager.cpp            |  4 ++--
 .../service_test/src/time_service_test.cpp      | 17 +++++++++++++++++
 utils/native/src/time_xcollie.cpp               | 10 +++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/services/timer/src/timer_manager.cpp b/services/timer/src/timer_manager.cpp
index 0cecaebe..2b259e03 100644
--- a/services/timer/src/timer_manager.cpp
+++ b/services/timer/src/timer_manager.cpp
@@ -1187,7 +1187,7 @@ bool TimerManager::ResetAllProxy()
 
 bool TimerManager::CheckAllowWhileIdle(const std::shared_ptr<TimerInfo> &alarm)
 {
-#ifdef DEVICE_STANDBY_ENABLE
+    #ifdef DEVICE_STANDBY_ENABLE
     if (TimePermission::CheckSystemUidCallingPermission(IPCSkeleton::GetCallingFullTokenID())) {
         std::vector<DevStandbyMgr::AllowInfo> restrictList;
         DevStandbyMgr::StandbyServiceClient::GetInstance().GetRestrictList(DevStandbyMgr::AllowType::TIMER,
@@ -1214,7 +1214,7 @@ bool TimerManager::CheckAllowWhileIdle(const std::shared_ptr<TimerInfo> &alarm)
             return false;
         }
     }
-#endif
+    #endif
     return true;
 }
 
diff --git a/test/unittest/service_test/src/time_service_test.cpp b/test/unittest/service_test/src/time_service_test.cpp
index 544d76ec..2ae9a018 100644
--- a/test/unittest/service_test/src/time_service_test.cpp
+++ b/test/unittest/service_test/src/time_service_test.cpp
@@ -502,6 +502,23 @@ HWTEST_F(TimeServiceTest, SetTime004, TestSize.Level1)
     DeletePermission();
 }
 
+/**
+* @tc.name: SetTimeInner001
+* @tc.desc: set system time by ability.
+* @tc.type: FUNC
+*/
+HWTEST_F(TimeServiceTest, SetTimeInner001, TestSize.Level1)
+{
+    struct timeval currentTime {
+    };
+    gettimeofday(&currentTime, NULL);
+    int64_t time = (currentTime.tv_sec + 1000) * 1000 + currentTime.tv_usec / 1000;
+    ASSERT_GT(time, 0);
+    TIME_HILOGI(TIME_MODULE_CLIENT, "Time now : %{public}" PRId64 "", time);
+    bool result = TimeSystemAbility::GetInstance()->SetTimeInner(time);
+    EXPECT_TRUE(result);
+}
+
 /**
 * @tc.name: SetTimeZone001
 * @tc.desc: set system time zone.
diff --git a/utils/native/src/time_xcollie.cpp b/utils/native/src/time_xcollie.cpp
index 2f6536b6..95dd3368 100644
--- a/utils/native/src/time_xcollie.cpp
+++ b/utils/native/src/time_xcollie.cpp
@@ -27,11 +27,11 @@ TimeXCollie::TimeXCollie(const std::string &name, uint32_t timeoutSeconds,
     std::function<void(void *)> func, void *arg, uint32_t flag)
 {
     name_ = name;
-#ifdef HICOLLIE_ENABLE
+    #ifdef HICOLLIE_ENABLE
     id_ = HiviewDFX::XCollie::GetInstance().SetTimer(name_, timeoutSeconds, func, arg, flag);
-#else
+    #else
     id_ = -1;
-#endif
+    #endif
     isCanceled_ = false;
     TIME_HILOGD(TIME_MODULE_SERVICE, "start TimeXCollie, name:%{public}s,timeout:%{public}u,flag:%{public}u,"
         "id:%{public}d", name_.c_str(), timeoutSeconds, flag, id_);
@@ -45,9 +45,9 @@ TimeXCollie::~TimeXCollie()
 void TimeXCollie::CancelTimeXCollie()
 {
     if (!isCanceled_) {
-#ifdef HICOLLIE_ENABLE
+        #ifdef HICOLLIE_ENABLE
         HiviewDFX::XCollie::GetInstance().CancelTimer(id_);
-#endif
+        #endif
         isCanceled_ = true;
         TIME_HILOGD(TIME_MODULE_SERVICE, "cancel TimeXCollie, tag:%{public}s,id:%{public}d", name_.c_str(), id_);
     }
-- 
Gitee