Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 586c6985 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblog: adb: move security interfaces to private" 

am: 09dac589

Change-Id: I05ad9cee5ffe00e842120aa960d6652517b94a16
parents d3896c10 09dac589

adb/file_sync_service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"

adb/shell_service.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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"

include/android/log.h

+0 −5
Original line number Diff line number Diff line
@@ -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);

include/private/android_logger.h

+4 −0
Original line number Diff line number Diff line
@@ -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

liblog/log_event_list.c

+1 −2
Original line number Diff line number Diff line
@@ -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"