commit 665902ee5abd1a6f3523432cd137befffed3b976
author Alex Ray <aray@google.com> Sat Mar 08 05:46:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Mar 08 05:46:35 2014 +0000
tree b5e21dc67e276cf013de7b69192edf4777242ee6
parent 733aebd398c5ea553373ed716d8c23fbb9ac5bdb
parent db480f7516977123a0c5c6f6705b282d2e55ab89

am db480f75: am 6a58c4f3: am 33e86e00: Merge "libcutils: add method to get klog level"

* commit 'db480f7516977123a0c5c6f6705b282d2e55ab89':
  libcutils: add method to get klog level

include/cutils/klog.h

diff --git a/include/cutils/klog.h b/include/cutils/klog.h
index 572367c..d5ae6d7 100644
--- a/include/cutils/klog.h
+++ b/include/cutils/klog.h
@@ -23,6 +23,7 @@
 __BEGIN_DECLS
 
 void klog_init(void);
+int  klog_get_level(void);
 void klog_set_level(int level);
 /* TODO: void klog_close(void); - and make klog_fd users thread safe. */
 void klog_write(int level, const char *fmt, ...)

libcutils/klog.c

diff --git a/libcutils/klog.c b/libcutils/klog.c
index d3c40df..fbb7b72 100644
--- a/libcutils/klog.c
+++ b/libcutils/klog.c
@@ -28,6 +28,10 @@
 static int klog_fd = -1;
 static int klog_level = KLOG_DEFAULT_LEVEL;
 
+int klog_get_level(void) {
+    return klog_level;
+}
+
 void klog_set_level(int level) {
     klog_level = level;
 }