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

Commit 693a0fae authored by Yao Chen's avatar Yao Chen Committed by android-build-merger
Browse files

Merge "make log.tag.stats_log work for stats buffer." am: 1e2ed53f 

am: 9e28024b

Change-Id: I63b2072f2781c3bbd71df94d1492c9b4ee0ea3ce
parents a471c4d9 9e28024b

liblog/logger_write.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec* vec, size_t nr) 
      /* If only we could reset downstream logd counter */

      return -EPERM;

    }

  } else if (log_id == LOG_ID_EVENTS) {

  } else if (log_id == LOG_ID_EVENTS || log_id == LOG_ID_STATS) {

    const char* tag;

    size_t len;

    EventTagMap *m, *f;

logd/LogBuffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ int LogBuffer::log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid, 
        int prio = ANDROID_LOG_INFO;

        const char* tag = nullptr;

        size_t tag_len = 0;

        if (log_id == LOG_ID_EVENTS) {

        if (log_id == LOG_ID_EVENTS || log_id == LOG_ID_STATS) {

            tag = tagToName(elem->getTag());

            if (tag) {

                tag_len = strlen(tag);