commit c0cfe38ef785259592846d957fa03e68c8977b37
author Wei Wang <wvw@google.com> Fri Jan 13 08:20:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 13 08:20:24 2017 +0000
tree af56385ff3bc5a7019abddc26b1169ef1072787d
parent d97e3fd9f343439ba8bb1403c9cda77a5e2704bb
parent ba49d3253ebfd63e2479cf8eef6ca533f52e90f5

Merge "libcutils: change klog_level to KLOG_INFO_LEVEL" am: 5e9863bf63 am: 974dd6291e
am: c87d4ce758

Change-Id: I89a9aac59e09895b725a9d6e02c649d030746aa7

include/cutils/klog.h

diff --git a/include/cutils/klog.h b/include/cutils/klog.h
index c837edb..e7cd300 100644
--- a/include/cutils/klog.h
+++ b/include/cutils/klog.h
@@ -44,6 +44,4 @@
 #define KLOG_INFO(tag,x...)    klog_write(KLOG_INFO_LEVEL, "<6>" tag ": " x)
 #define KLOG_DEBUG(tag,x...)   klog_write(KLOG_DEBUG_LEVEL, "<7>" tag ": " x)
 
-#define KLOG_DEFAULT_LEVEL  3  /* messages <= this level are logged */
-
 #endif

libcutils/klog.cpp

diff --git a/libcutils/klog.cpp b/libcutils/klog.cpp
index 4bad28a..15adf6b 100644
--- a/libcutils/klog.cpp
+++ b/libcutils/klog.cpp
@@ -27,7 +27,7 @@
 #include <cutils/android_get_control_file.h>
 #include <cutils/klog.h>
 
-static int klog_level = KLOG_DEFAULT_LEVEL;
+static int klog_level = KLOG_INFO_LEVEL;
 
 int klog_get_level(void) {
     return klog_level;