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

Commit 4f5fd780 authored by vandwalle's avatar vandwalle Committed by Android Git Automerger
Browse files

am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev

* commit '68104b05':
  add millisecond timestamp to locallog
parents 4453d585 68104b05
Loading
Loading
Loading
Loading
+8 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.text.format.Time;

import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.Calendar;
import java.util.Iterator;
import java.util.LinkedList;

@@ -30,18 +31,21 @@ public final class LocalLog {

    private LinkedList<String> mLog;
    private int mMaxLines;
    private Time mNow;
    private long mNow;

    public LocalLog(int maxLines) {
        mLog = new LinkedList<String>();
        mMaxLines = maxLines;
        mNow = new Time();
    }

    public synchronized void log(String msg) {
        if (mMaxLines > 0) {
            mNow.setToNow();
            mLog.add(mNow.format("%H:%M:%S") + " - " + msg);
            mNow = System.currentTimeMillis();
            StringBuilder sb = new StringBuilder();
            Calendar c = Calendar.getInstance();
            c.setTimeInMillis(mNow);
            sb.append(String.format("%tm-%td %tH:%tM:%tS.%tL", c, c, c, c, c, c));
            mLog.add(sb.toString() + " - " + msg);
            while (mLog.size() > mMaxLines) mLog.remove();
        }
    }
+1 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ public class WifiConfiguration implements Parcelable {
                    sbuf.append(",ipfail=");
                    sbuf.append(result.numIpConfigFailures);
                }
                sbuf.append(result.autoJoinStatus).append("} ");
                sbuf.append(",").append(result.autoJoinStatus).append("} ");
            }
            sbuf.append('\n');
        }