diff --git a/services/timer/src/timer_manager.cpp b/services/timer/src/timer_manager.cpp index 0cecaebeaad020d23c5ba1275ebe5b712b6ffe22..2b259e0367a8408a082160df12e447474f611eb9 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 &alarm) { -#ifdef DEVICE_STANDBY_ENABLE + #ifdef DEVICE_STANDBY_ENABLE if (TimePermission::CheckSystemUidCallingPermission(IPCSkeleton::GetCallingFullTokenID())) { std::vector restrictList; DevStandbyMgr::StandbyServiceClient::GetInstance().GetRestrictList(DevStandbyMgr::AllowType::TIMER, @@ -1214,7 +1214,7 @@ bool TimerManager::CheckAllowWhileIdle(const std::shared_ptr &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 544d76ec58f84f8b4a78a8f48a02e27fc56e730d..2ae9a0183d4062f513131a579bbbe77dd5485c8e 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(¤tTime, 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 2f6536b6ec7482eddaa44d2632413ea21311000e..95dd3368812032e20039fb1a173a2c2954507830 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 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_); }