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

Commit 1d17dee5 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "liblog: return -EPERM if a log_is_loggable() returns false" am: 6b76de04 

Change-Id: I2202cbd85a630d3f59229fa74a873fa2abb9c85c
parents 11f33e3f 6b76de04

liblog/logger_write.cpp

+4 −4
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ int __android_log_buf_write(int bufID, int prio, const char* tag, const char* ms 
  ErrnoRestorer errno_restorer;



  if (!__android_log_is_loggable(prio, tag, ANDROID_LOG_VERBOSE)) {

    return 0;

    return -EPERM;

  }



  __android_log_message log_message = {
@@ -343,7 +343,7 @@ int __android_log_vprint(int prio, const char* tag, const char* fmt, va_list ap) 
  ErrnoRestorer errno_restorer;



  if (!__android_log_is_loggable(prio, tag, ANDROID_LOG_VERBOSE)) {

    return 0;

    return -EPERM;

  }



  __attribute__((uninitialized)) char buf[LOG_BUF_SIZE];
@@ -360,7 +360,7 @@ int __android_log_print(int prio, const char* tag, const char* fmt, ...) { 
  ErrnoRestorer errno_restorer;



  if (!__android_log_is_loggable(prio, tag, ANDROID_LOG_VERBOSE)) {

    return 0;

    return -EPERM;

  }



  va_list ap;
@@ -380,7 +380,7 @@ int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fm 
  ErrnoRestorer errno_restorer;



  if (!__android_log_is_loggable(prio, tag, ANDROID_LOG_VERBOSE)) {

    return 0;

    return -EPERM;

  }



  va_list ap;