summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2015-12-07 12:30:58 -0600
committerMark Salyzyn2015-12-07 12:30:58 -0600
commit9e18cdcebd893fbbb2369d893be219a7d832865f (patch)
treed4f5b63389a69e0102f63758d42a3737161c0ddc /liblog/logprint.c
parent77b5696b1dea6f7afed89e113e479f4a131c14fc (diff)
downloadplatform-system-core-9e18cdcebd893fbbb2369d893be219a7d832865f.tar.gz
platform-system-core-9e18cdcebd893fbbb2369d893be219a7d832865f.tar.xz
platform-system-core-9e18cdcebd893fbbb2369d893be219a7d832865f.zip
Revert "logd: liblog: logcat: switch to android_log_clockid()"
This reverts commit 77b5696b1dea6f7afed89e113e479f4a131c14fc. Change-Id: I7711bf1a7e3f72ed29a2498d7287b725a0e624bd
Diffstat (limited to 'liblog/logprint.c')
-rw-r--r--liblog/logprint.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/liblog/logprint.c b/liblog/logprint.c
index ad52a8119..ebf9786aa 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -203,7 +203,7 @@ AndroidLogFormat *android_log_format_new()
203 p_ret->year_output = false; 203 p_ret->year_output = false;
204 p_ret->zone_output = false; 204 p_ret->zone_output = false;
205 p_ret->epoch_output = false; 205 p_ret->epoch_output = false;
206 p_ret->monotonic_output = android_log_clockid() == CLOCK_MONOTONIC; 206 p_ret->monotonic_output = android_log_timestamp() == 'm';
207 207
208 return p_ret; 208 return p_ret;
209} 209}
@@ -1262,7 +1262,7 @@ char *android_log_formatLogLine (
1262 nsec = entry->tv_nsec; 1262 nsec = entry->tv_nsec;
1263 if (p_format->monotonic_output) { 1263 if (p_format->monotonic_output) {
1264 // prevent convertMonotonic from being called if logd is monotonic 1264 // prevent convertMonotonic from being called if logd is monotonic
1265 if (android_log_clockid() != CLOCK_MONOTONIC) { 1265 if (android_log_timestamp() != 'm') {
1266 struct timespec time; 1266 struct timespec time;
1267 convertMonotonic(&time, entry); 1267 convertMonotonic(&time, entry);
1268 now = time.tv_sec; 1268 now = time.tv_sec;