diff options
-rw-r--r-- | include/private/android_logger.h | 2 | ||||
-rw-r--r-- | liblog/fake_log_device.c | 5 | ||||
-rw-r--r-- | liblog/log_is_loggable.c | 2 | ||||
-rw-r--r-- | liblog/logger.h | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/include/private/android_logger.h b/include/private/android_logger.h index 141001cb9..94095d1df 100644 --- a/include/private/android_logger.h +++ b/include/private/android_logger.h | |||
@@ -130,6 +130,8 @@ int __android_log_security_bwrite(int32_t tag, const void *payload, size_t len); | |||
130 | int __android_log_security_bswrite(int32_t tag, const char *payload); | 130 | int __android_log_security_bswrite(int32_t tag, const char *payload); |
131 | int __android_log_security(); /* Device Owner is present */ | 131 | int __android_log_security(); /* Device Owner is present */ |
132 | 132 | ||
133 | int __android_log_is_debuggable(); | ||
134 | |||
133 | #if defined(__cplusplus) | 135 | #if defined(__cplusplus) |
134 | } | 136 | } |
135 | #endif | 137 | #endif |
diff --git a/liblog/fake_log_device.c b/liblog/fake_log_device.c index 7bd1f83d4..5f7f05b9d 100644 --- a/liblog/fake_log_device.c +++ b/liblog/fake_log_device.c | |||
@@ -727,3 +727,8 @@ LIBLOG_ABI_PUBLIC int __android_log_is_loggable_len(int prio, | |||
727 | int logLevel = def; | 727 | int logLevel = def; |
728 | return logLevel >= 0 && prio >= logLevel; | 728 | return logLevel >= 0 && prio >= logLevel; |
729 | } | 729 | } |
730 | |||
731 | LIBLOG_ABI_PRIVATE int __android_log_is_debuggable() | ||
732 | { | ||
733 | return 1; | ||
734 | } | ||
diff --git a/liblog/log_is_loggable.c b/liblog/log_is_loggable.c index 4af8507a2..3dfc6a6f7 100644 --- a/liblog/log_is_loggable.c +++ b/liblog/log_is_loggable.c | |||
@@ -274,7 +274,7 @@ LIBLOG_ABI_PUBLIC int __android_log_is_loggable(int prio, | |||
274 | return logLevel >= 0 && prio >= logLevel; | 274 | return logLevel >= 0 && prio >= logLevel; |
275 | } | 275 | } |
276 | 276 | ||
277 | LIBLOG_HIDDEN int __android_log_is_debuggable() | 277 | LIBLOG_ABI_PRIVATE int __android_log_is_debuggable() |
278 | { | 278 | { |
279 | static uint32_t serial; | 279 | static uint32_t serial; |
280 | static struct cache tag_cache; | 280 | static struct cache tag_cache; |
diff --git a/liblog/logger.h b/liblog/logger.h index 8fb2b4d47..bacb24304 100644 --- a/liblog/logger.h +++ b/liblog/logger.h | |||
@@ -155,7 +155,6 @@ static inline uid_t __android_log_uid() { return getuid(); } | |||
155 | LIBLOG_HIDDEN void __android_log_lock(); | 155 | LIBLOG_HIDDEN void __android_log_lock(); |
156 | LIBLOG_HIDDEN int __android_log_trylock(); | 156 | LIBLOG_HIDDEN int __android_log_trylock(); |
157 | LIBLOG_HIDDEN void __android_log_unlock(); | 157 | LIBLOG_HIDDEN void __android_log_unlock(); |
158 | LIBLOG_HIDDEN int __android_log_is_debuggable(); | ||
159 | 158 | ||
160 | __END_DECLS | 159 | __END_DECLS |
161 | 160 | ||