commit 3132543d837f24c7afde29bd5f9751896f15f211
author Mark Salyzyn <salyzyn@google.com> Mon Oct 17 21:57:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 17 21:57:22 2016 +0000
tree f64337aa8eac9e9c666dc5027438d32882c877ff
parent 07f2357b56781eb588589bdb769ca43e2f283bd9
parent 915d620359fc660bade576942742e576ed780359

Merge "liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()"
am: 915d620359

Change-Id: I66547a2d32c96b9baffccb8a391a15a155faf123

include/private/android_logger.h

diff --git a/include/private/android_logger.h b/include/private/android_logger.h
index 141001c..94095d1 100644
--- a/include/private/android_logger.h
+++ b/include/private/android_logger.h
@@ -130,6 +130,8 @@
 int __android_log_security_bswrite(int32_t tag, const char *payload);
 int __android_log_security(); /* Device Owner is present */
 
+int __android_log_is_debuggable();
+
 #if defined(__cplusplus)
 }
 #endif

liblog/fake_log_device.c

diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c
index 7bd1f83..5f7f05b 100644
--- a/liblog/fake_log_device.c
+++ b/liblog/fake_log_device.c
@@ -727,3 +727,8 @@
     int logLevel = def;
     return logLevel >= 0 && prio >= logLevel;
 }
+
+LIBLOG_ABI_PRIVATE int __android_log_is_debuggable()
+{
+    return 1;
+}

liblog/log_is_loggable.c

diff --git a/liblog/log_is_loggable.c b/liblog/log_is_loggable.c
index 4af8507..3dfc6a6 100644
--- a/liblog/log_is_loggable.c
+++ b/liblog/log_is_loggable.c
@@ -274,7 +274,7 @@
     return logLevel >= 0 && prio >= logLevel;
 }
 
-LIBLOG_HIDDEN int __android_log_is_debuggable()
+LIBLOG_ABI_PRIVATE int __android_log_is_debuggable()
 {
     static uint32_t serial;
     static struct cache tag_cache;

liblog/logger.h

diff --git a/liblog/logger.h b/liblog/logger.h
index d4f243a..d2aebcb 100644
--- a/liblog/logger.h
+++ b/liblog/logger.h
@@ -157,7 +157,6 @@
 LIBLOG_HIDDEN void __android_log_lock();
 LIBLOG_HIDDEN int __android_log_trylock();
 LIBLOG_HIDDEN void __android_log_unlock();
-LIBLOG_HIDDEN int __android_log_is_debuggable();
 
 __END_DECLS