Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22ed1a7a authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Use ISO 8601 format for LocalLog local timestamps" am: 172fd44b 

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

Change-Id: I42db5ec854130e3e2eb5ebd7d392b367555b47de
parents f8fb1fe9 172fd44b

core/java/android/util/LocalLog.java

+3 −1
Original line number Diff line number Diff line
@@ -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);

    }