From 71d58dbd36ce991491417f307805cf7c5ff26203 Mon Sep 17 00:00:00 2001 From: guduhanyan Date: Tue, 12 Oct 2021 19:37:56 +0800 Subject: [PATCH] 20211012LTS02 Signed-off-by: guduhanyan --- services/time_manager/src/time_service.cpp | 2 +- services/timer/src/timer_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/time_manager/src/time_service.cpp b/services/time_manager/src/time_service.cpp index 2cc1c5d..1f6878f 100644 --- a/services/time_manager/src/time_service.cpp +++ b/services/time_manager/src/time_service.cpp @@ -32,7 +32,7 @@ #include "pthread.h" #include "time_service.h" -#include "time_zone_info.h" +#include "time_zone_info.h" #include "time_common.h" #include "system_ability.h" #include "system_ability_definition.h" diff --git a/services/timer/src/timer_manager.cpp b/services/timer/src/timer_manager.cpp index 036cd21..962ee2a 100644 --- a/services/timer/src/timer_manager.cpp +++ b/services/timer/src/timer_manager.cpp @@ -464,7 +464,7 @@ void TimerManager::SetLocked(int type, std::chrono::nanoseconds when) void TimerManager::InsertAndBatchTimerLocked(std::shared_ptr alarm) { TIME_HILOGI(TIME_MODULE_SERVICE, "start"); - int64_t whichBatch = (alarm->flags & static_cast(STANDALONE)) ? -1 + int64_t whichBatch = (alarm->flags & static_cast(STANDALONE)) ? -1 : AttemptCoalesceLocked(alarm->whenElapsed, alarm->maxWhenElapsed); TIME_HILOGI(TIME_MODULE_SERVICE, "whichBatch= %{public}" PRId64 "", whichBatch); if (whichBatch < 0) {