diff options
| author | Neil Fuller <nfuller@google.com> | 2021-12-07 15:05:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-07 15:05:55 +0000 |
| commit | 218b1d80e4b2cb34ffa0b14c9bf4dad57cc3d8d0 (patch) | |
| tree | d05790482eeddaebbc06a8644ae9630a317f7c1d /core/java/android | |
| parent | 8fa168d64df74acac0c8e402c82015dd61920eb9 (diff) | |
| parent | 22ed1a7a79994aa4c0bed4ab87b065cc60b4f160 (diff) | |
Merge "Use ISO 8601 format for LocalLog local timestamps" am: 172fd44b2f am: 22ed1a7a79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878440
Change-Id: I918da367c15a2ba74fac065482f271f536ef982e
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/util/LocalLog.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/util/LocalLog.java b/core/java/android/util/LocalLog.java index 8c4dcb3b28e2..cd077e1f756c 100644 --- a/core/java/android/util/LocalLog.java +++ b/core/java/android/util/LocalLog.java @@ -22,6 +22,7 @@ import android.os.SystemClock; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.time.Duration; import java.time.Instant; import java.time.LocalDateTime; import java.util.ArrayDeque; @@ -63,7 +64,8 @@ public final class LocalLog { if (mUseLocalTimestamps) { logLine = LocalDateTime.now() + " - " + msg; } else { - logLine = SystemClock.elapsedRealtime() + " / " + Instant.now() + " - " + msg; + logLine = Duration.ofMillis(SystemClock.elapsedRealtime()) + + " / " + Instant.now() + " - " + msg; } append(logLine); } |