From 6debf985aa5127b43f1f79a010dc000f733793b8 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Wed, 5 Oct 2016 08:13:56 -0700
Subject: [PATCH] liblog: adb: move security interfaces to private

Test: Compile & adb functioning
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I7ad8963bcca3d8b5c37b547c11d163b652d35556
---
 adb/file_sync_service.cpp        | 2 +-
 adb/shell_service.cpp            | 4 ++--
 include/android/log.h            | 5 -----
 include/private/android_logger.h | 4 ++++
 liblog/log_event_list.c          | 3 +--
 5 files changed, 8 insertions(+), 10 deletions(-)

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 <unistd.h>
 #include <utime.h>
 
-#include <android/log.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 #include <private/android_filesystem_config.h>
+#include <private/android_logger.h>
 #include <selinux/android.h>
 
 #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 <errno.h>
+#include <paths.h>
 #include <pty.h>
 #include <pwd.h>
 #include <sys/select.h>
@@ -92,10 +93,9 @@
 #include <unordered_map>
 #include <vector>
 
-#include <android/log.h>
 #include <android-base/logging.h>
 #include <android-base/stringprintf.h>
-#include <paths.h>
+#include <private/android_logger.h>
 
 #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 <stdlib.h>
 #include <string.h>
 
-#include <android/log.h>
-#include <log/logger.h>
+#include <private/android_logger.h>
 
 #include "log_portability.h"