From 68bdf0495f0cc343d804f1f4843e487a00129342 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 14 May 2021 14:56:35 +0100 Subject: [PATCH] Output current times in ISO-8601 format ISO-8601 seconds based representation is used in various dumpsys logs related to time / time zone detection. This helps by providing a clear record of what "now" was without resorting to a calculator / other tools. Bug: 188174391 Test: adb shell dumpsys time_detector Change-Id: Ie6fc0f4e78c1284b0ed41e1cfbb6cc690556693a --- .../server/timedetector/TimeDetectorStrategyImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java index 357c232226582..e751a7bf2c266 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java @@ -42,6 +42,7 @@ import com.android.server.timezonedetector.ArrayMapWithHistory; import com.android.server.timezonedetector.ConfigurationChangeListener; import com.android.server.timezonedetector.ReferenceWithHistory; +import java.time.Duration; import java.time.Instant; import java.util.Arrays; import java.util.Objects; @@ -321,12 +322,16 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { ipw.println("mLastAutoSystemClockTimeSet=" + mLastAutoSystemClockTimeSet); ipw.println("mEnvironment.isAutoTimeDetectionEnabled()=" + mEnvironment.isAutoTimeDetectionEnabled()); - ipw.println("mEnvironment.elapsedRealtimeMillis()=" + mEnvironment.elapsedRealtimeMillis()); - ipw.println("mEnvironment.systemClockMillis()=" + mEnvironment.systemClockMillis()); + long elapsedRealtimeMillis = mEnvironment.elapsedRealtimeMillis(); + ipw.printf("mEnvironment.elapsedRealtimeMillis()=%s (%s)\n", + Duration.ofMillis(elapsedRealtimeMillis), elapsedRealtimeMillis); + long systemClockMillis = mEnvironment.systemClockMillis(); + ipw.printf("mEnvironment.systemClockMillis()=%s (%s)\n", + Instant.ofEpochMilli(systemClockMillis), systemClockMillis); ipw.println("mEnvironment.systemClockUpdateThresholdMillis()=" + mEnvironment.systemClockUpdateThresholdMillis()); Instant autoTimeLowerBound = mEnvironment.autoTimeLowerBound(); - ipw.printf("mEnvironment.autoTimeLowerBound()=%s(%s)\n", + ipw.printf("mEnvironment.autoTimeLowerBound()=%s (%s)\n", autoTimeLowerBound, autoTimeLowerBound.toEpochMilli()); String priorities = Arrays.stream(mEnvironment.autoOriginPriorities())