summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-11-16 19:00:41 +0000
committerMark Salyzyn <salyzyn@google.com>2015-11-16 19:00:41 +0000
commitc2e7d4965f86dbe90cece6d25e91d934a698d195 (patch)
treecb111a72734a1b9e496a0a94765a568eb4eb00a6 /include
parent7a2a3071921b11d7e476862e7f9cbe72be43d0f7 (diff)
downloadsystem_core-c2e7d4965f86dbe90cece6d25e91d934a698d195.tar.gz
system_core-c2e7d4965f86dbe90cece6d25e91d934a698d195.tar.bz2
system_core-c2e7d4965f86dbe90cece6d25e91d934a698d195.zip
Revert "liblog: resolve deadlocks"
This reverts commit 7a2a3071921b11d7e476862e7f9cbe72be43d0f7. Bug: 25693940 Change-Id: I9a7c926289e972f80c03c92e33535e1dedaa7381
Diffstat (limited to 'include')
-rw-r--r--include/log/log.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/log/log.h b/include/log/log.h
index e0dc3a3d0..1cdf7bc49 100644
--- a/include/log/log.h
+++ b/include/log/log.h
@@ -616,12 +616,7 @@ typedef enum log_id {
* Use the per-tag properties "log.tag.<tagname>" to generate a runtime
* result of non-zero to expose a log.
*/
-/* default prio ANDROID_LOG_VERBOSE to ANDROID_LOG_FATAL if no property */
-#define ANDROID_LOGGABLE_FLAG_DEFAULT_MASK 0x000F
-/* Save 2 syscalls if caller guarantees to never call within signal handler */
-#define ANDROID_LOGGABLE_FLAG_NOT_WITHIN_SIGNAL 0x8000
-
-int __android_log_is_loggable(int prio, const char *tag, int flag);
+int __android_log_is_loggable(int prio, const char *tag, int def);
int __android_log_error_write(int tag, const char *subTag, int32_t uid, const char *data,
uint32_t dataLen);