commit 40bf513506e5a64d8fcdff006606a8ddc255bacd
author vandwalle <vandwalle@google.com> Fri Oct 03 23:57:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 03 23:57:21 2014 +0000
tree 0ad244af7e2c779d4be76da8d72e15f418749d60
parent ab47e4c06ec5f0e46cf89c832846098e506f2e03
parent 68104b0529da95644c6cb65ab7ebb0c0bf7dff57

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

* commit '68104b0529da95644c6cb65ab7ebb0c0bf7dff57':
  add millisecond timestamp to locallog

core/java/android/util/LocalLog.java

diff --git a/core/java/android/util/LocalLog.java b/core/java/android/util/LocalLog.java
index eeb6d58..e49b8c3 100644
--- a/core/java/android/util/LocalLog.java
+++ b/core/java/android/util/LocalLog.java
@@ -20,6 +20,7 @@
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
+import java.util.Calendar;
 import java.util.Iterator;
 import java.util.LinkedList;
 
@@ -30,18 +31,21 @@
 
     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();
         }
     }

wifi/java/android/net/wifi/WifiConfiguration.java

diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 5514798..53756d2 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -1072,7 +1072,7 @@
                     sbuf.append(",ipfail=");
                     sbuf.append(result.numIpConfigFailures);
                 }
-                sbuf.append(result.autoJoinStatus).append("} ");
+                sbuf.append(",").append(result.autoJoinStatus).append("} ");
             }
             sbuf.append('\n');
         }