Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use ISO 8601 format for LocalLog local timestamps" am: 172fd44b2f am: 22ed1a7a79

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1878440

Change-Id: I918da367c15a2ba74fac065482f271f536ef982e
This commit is contained in:
Neil Fuller
2021-12-07 15:05:55 +00:00
committed by Automerger Merge Worker
parent 8fa168d64d 22ed1a7a79
commit 218b1d80e4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/util/LocalLog.java
View File

@@ -22,6 +22,7 @@ import android.os.SystemClock;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayDeque; import java.util.ArrayDeque;
@@ -63,7 +64,8 @@ public final class LocalLog {
if (mUseLocalTimestamps) { if (mUseLocalTimestamps) {
logLine = LocalDateTime.now() + " - " + msg; logLine = LocalDateTime.now() + " - " + msg;
} else { } else {
logLine = SystemClock.elapsedRealtime() + " / " + Instant.now() + " - " + msg; logLine = Duration.ofMillis(SystemClock.elapsedRealtime())
+ " / " + Instant.now() + " - " + msg;
} }
append(logLine); append(logLine);
} }