diff options
Diffstat (limited to 'liblog/include/log/log.h')
-rw-r--r-- | liblog/include/log/log.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/liblog/include/log/log.h b/liblog/include/log/log.h index 6758c8415..3a215e976 100644 --- a/liblog/include/log/log.h +++ b/liblog/include/log/log.h | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <log/log_main.h> | 32 | #include <log/log_main.h> |
33 | #include <log/log_radio.h> | 33 | #include <log/log_radio.h> |
34 | #include <log/log_read.h> | 34 | #include <log/log_read.h> |
35 | #include <log/log_safetynet.h> | ||
35 | #include <log/log_system.h> | 36 | #include <log/log_system.h> |
36 | #include <log/log_time.h> | 37 | #include <log/log_time.h> |
37 | #include <log/uio.h> /* helper to define iovec for portability */ | 38 | #include <log/uio.h> /* helper to define iovec for portability */ |
@@ -167,31 +168,6 @@ clockid_t android_log_clockid(); | |||
167 | 168 | ||
168 | /* --------------------------------------------------------------------- */ | 169 | /* --------------------------------------------------------------------- */ |
169 | 170 | ||
170 | #ifndef _ANDROID_USE_LIBLOG_SAFETYNET_INTERFACE | ||
171 | #ifndef __ANDROID_API__ | ||
172 | #define __ANDROID_USE_LIBLOG_SAFETYNET_INTERFACE 1 | ||
173 | #elif __ANDROID_API__ > 22 /* > Lollipop */ | ||
174 | #define __ANDROID_USE_LIBLOG_SAFETYNET_INTERFACE 1 | ||
175 | #else | ||
176 | #define __ANDROID_USE_LIBLOG_SAFETYNET_INTERFACE 0 | ||
177 | #endif | ||
178 | #endif | ||
179 | |||
180 | #if __ANDROID_USE_LIBLOG_SAFETYNET_INTERFACE | ||
181 | |||
182 | #define android_errorWriteLog(tag, subTag) \ | ||
183 | __android_log_error_write(tag, subTag, -1, NULL, 0) | ||
184 | |||
185 | #define android_errorWriteWithInfoLog(tag, subTag, uid, data, dataLen) \ | ||
186 | __android_log_error_write(tag, subTag, uid, data, dataLen) | ||
187 | |||
188 | int __android_log_error_write(int tag, const char* subTag, int32_t uid, | ||
189 | const char* data, uint32_t dataLen); | ||
190 | |||
191 | #endif /* __ANDROID_USE_LIBLOG_SAFETYNET_INTERFACE */ | ||
192 | |||
193 | /* --------------------------------------------------------------------- */ | ||
194 | |||
195 | #ifndef __ANDROID_USE_LIBLOG_CLOSE_INTERFACE | 171 | #ifndef __ANDROID_USE_LIBLOG_CLOSE_INTERFACE |
196 | #ifndef __ANDROID_API__ | 172 | #ifndef __ANDROID_API__ |
197 | #define __ANDROID_USE_LIBLOG_CLOSE_INTERFACE 1 | 173 | #define __ANDROID_USE_LIBLOG_CLOSE_INTERFACE 1 |