tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "liblog: adb: move security interfaces to private" am: 09dac589f1

Browse source 
am: 586c6985cf

Change-Id: I8c54bdc1a3582be1fc7c4a9be83b555624fcb0a3
This commit is contained in:
Mark Salyzyn 2016-10-10 23:29:55 +00:00 committed by android-build-merger
commit 4b5456eacc
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/file_sync_service.cpp
View file

@ -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"

4
adb/shell_service.cpp
View file

@ -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"

5
include/android/log.h
View file

@ -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);

4
include/private/android_logger.h
View file

@ -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

3
liblog/log_event_list.c
View file

@ -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"