ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 3132543d83

Change-Id: I9b6bd25900ddc878848c5df62ed0697a5363c161
This commit is contained in:
Mark Salyzyn 2016-10-17 22:04:23 +00:00 • committed by android-build-merger
commit 224865fce8
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/private/android_logger.h
View file

@ -130,6 +130,8 @@ int __android_log_security_bwrite(int32_t tag, const void *payload, size_t len);
int __android_log_security_bswrite(int32_t tag, const char *payload); int __android_log_security_bswrite(int32_t tag, const char *payload);
int __android_log_security(); /* Device Owner is present */ int __android_log_security(); /* Device Owner is present */
int __android_log_is_debuggable();
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif

5
liblog/fake_log_device.c
View file

@ -727,3 +727,8 @@ LIBLOG_ABI_PUBLIC int __android_log_is_loggable_len(int prio,
int logLevel = def; int logLevel = def;
return logLevel >= 0 && prio >= logLevel; return logLevel >= 0 && prio >= logLevel;
} }
LIBLOG_ABI_PRIVATE int __android_log_is_debuggable()
{
return 1;
}

2
liblog/log_is_loggable.c
View file

@ -274,7 +274,7 @@ LIBLOG_ABI_PUBLIC int __android_log_is_loggable(int prio,
return logLevel >= 0 && prio >= logLevel; 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 uint32_t serial;
static struct cache tag_cache; static struct cache tag_cache;

1
liblog/logger.h
View file

@ -157,7 +157,6 @@ static inline uid_t __android_log_uid() { return getuid(); }
LIBLOG_HIDDEN void __android_log_lock(); LIBLOG_HIDDEN void __android_log_lock();
LIBLOG_HIDDEN int __android_log_trylock(); LIBLOG_HIDDEN int __android_log_trylock();
LIBLOG_HIDDEN void __android_log_unlock(); LIBLOG_HIDDEN void __android_log_unlock();
LIBLOG_HIDDEN int __android_log_is_debuggable();
__END_DECLS __END_DECLS