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

Commit 915d6203 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "liblog: LIBLOG_ABI_PRIVATE __android_log_is_debuggable()"

parents 6da1ea0e 9ea359fc

include/private/android_logger.h

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,8 @@ 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 */



int __android_log_is_debuggable();



#if defined(__cplusplus)

}

#endif

liblog/fake_log_device.c

+5 −0
Original line number Diff line number Diff line
@@ -727,3 +727,8 @@ LIBLOG_ABI_PUBLIC int __android_log_is_loggable_len(int prio, 
    int logLevel = def;

    return logLevel >= 0 && prio >= logLevel;

}



LIBLOG_ABI_PRIVATE int __android_log_is_debuggable()

{

    return 1;

}

liblog/log_is_loggable.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ LIBLOG_ABI_PUBLIC int __android_log_is_loggable(int prio, 
    return logLevel >= 0 && prio >= logLevel;

}



LIBLOG_HIDDEN int __android_log_is_debuggable()

LIBLOG_ABI_PRIVATE int __android_log_is_debuggable()

{

    static uint32_t serial;

    static struct cache tag_cache;

liblog/logger.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ static inline uid_t __android_log_uid() { return getuid(); } 
LIBLOG_HIDDEN void __android_log_lock();

LIBLOG_HIDDEN int __android_log_trylock();

LIBLOG_HIDDEN void __android_log_unlock();

LIBLOG_HIDDEN int __android_log_is_debuggable();



__END_DECLS