commit 9e18cdcebd893fbbb2369d893be219a7d832865f
author Mark Salyzyn <salyzyn@google.com> Mon Dec 07 18:30:58 2015 +0000
committer Mark Salyzyn <salyzyn@google.com> Mon Dec 07 18:30:58 2015 +0000
tree d4f5b63389a69e0102f63758d42a3737161c0ddc
parent 77b5696b1dea6f7afed89e113e479f4a131c14fc

Revert "logd: liblog: logcat: switch to android_log_clockid()"

This reverts commit 77b5696b1dea6f7afed89e113e479f4a131c14fc.

Change-Id: I7711bf1a7e3f72ed29a2498d7287b725a0e624bd

liblog/logprint.c

diff --git a/liblog/logprint.c b/liblog/logprint.c
index ad52a81..ebf9786 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -203,7 +203,7 @@
     p_ret->year_output = false;
     p_ret->zone_output = false;
     p_ret->epoch_output = false;
-    p_ret->monotonic_output = android_log_clockid() == CLOCK_MONOTONIC;
+    p_ret->monotonic_output = android_log_timestamp() == 'm';
 
     return p_ret;
 }
@@ -1262,7 +1262,7 @@
     nsec = entry->tv_nsec;
     if (p_format->monotonic_output) {
         // prevent convertMonotonic from being called if logd is monotonic
-        if (android_log_clockid() != CLOCK_MONOTONIC) {
+        if (android_log_timestamp() != 'm') {
             struct timespec time;
             convertMonotonic(&time, entry);
             now = time.tv_sec;