diff --git a/adb/file_sync_service.cpp b/adb/file_sync_service.cpp index 2dfad94b7..837902a0a 100644 --- a/adb/file_sync_service.cpp +++ b/adb/file_sync_service.cpp @@ -31,10 +31,10 @@ #include #include -#include #include #include #include +#include #include #include "adb.h" diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp index 7b00d9d76..e2b388bf3 100644 --- a/adb/shell_service.cpp +++ b/adb/shell_service.cpp @@ -82,6 +82,7 @@ #include "shell_service.h" #include +#include #include #include #include @@ -92,10 +93,9 @@ #include #include -#include #include #include -#include +#include #include "adb.h" #include "adb_io.h" diff --git a/include/android/log.h b/include/android/log.h index 5f20f8c5a..9b26839a4 100644 --- a/include/android/log.h +++ b/include/android/log.h @@ -178,9 +178,6 @@ int __android_log_btwrite(int32_t tag, char type, const void *payload, size_t len); int __android_log_bswrite(int32_t tag, const char *payload); -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); - // --------------------------------------------------------------------- /* @@ -820,8 +817,6 @@ int android_log_destroy(android_log_context *ctx); int __android_log_is_loggable(int prio, const char *tag, int default_prio); int __android_log_is_loggable_len(int prio, const char *tag, size_t len, int default_prio); -int __android_log_security(); /* Device Owner is present */ - int __android_log_error_write(int tag, const char *subTag, int32_t uid, const char *data, uint32_t dataLen); diff --git a/include/private/android_logger.h b/include/private/android_logger.h index d477ac1c4..141001cb9 100644 --- a/include/private/android_logger.h +++ b/include/private/android_logger.h @@ -126,6 +126,10 @@ ssize_t __android_log_pmsg_file_read( log_id_t logId, char prio, const char *prefix, __android_log_pmsg_file_read_fn fn, void *arg); +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(); /* Device Owner is present */ + #if defined(__cplusplus) } #endif diff --git a/liblog/log_event_list.c b/liblog/log_event_list.c index a4244cd05..11d8afb88 100644 --- a/liblog/log_event_list.c +++ b/liblog/log_event_list.c @@ -22,8 +22,7 @@ #include #include -#include -#include +#include #include "log_portability.h"