commit d2d35df279bcc6535455459ba9bd6aff077b7ea3
author Mark Salyzyn <salyzyn@google.com> Fri Dec 11 21:43:17 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 11 21:43:17 2015 +0000
tree 2ba7a2eba40bb7e28489bb3bb4aa3a6cebbbf2c4
parent b11afd7741c5e939bf5c6fb47dcadc49e3664f32
parent 7bc8023857ebe8ce91b659e6dce3004b38f91e8b

Merge "liblog: logprint security ANDROID_LOG_WARN"

liblog/logprint.c

diff --git a/liblog/logprint.c b/liblog/logprint.c
index 746eb8a..bd36cdd 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -750,12 +750,17 @@
     entry->tid = buf->tid;
 
     /*
-     * Pull the tag out.
+     * Pull the tag out, fill in some additional details based on incoming
+     * buffer version (v3 adds lid, v4 adds uid).
      */
     eventData = (const unsigned char*) buf->msg;
     struct logger_entry_v2 *buf2 = (struct logger_entry_v2 *)buf;
     if (buf2->hdr_size) {
         eventData = ((unsigned char *)buf2) + buf2->hdr_size;
+        if ((buf2->hdr_size >= sizeof(struct logger_entry_v3)) &&
+                (((struct logger_entry_v3 *)buf)->lid == LOG_ID_SECURITY)) {
+            entry->priority = ANDROID_LOG_WARN;
+        }
         if (buf2->hdr_size >= sizeof(struct logger_entry_v4)) {
             entry->uid = ((struct logger_entry_v4 *)buf)->uid;
         }