commit c7fe1552d5aca5100c798011bfeb288fbe3dc090
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 09 02:09:31 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 09 02:09:31 2019 +0000
tree 4702f0f31144a59fdb5306e5f5d818bd52a84fb4
parent 747aa9a49bbd4cf7e6d199696c871af21b4f4026
parent fe535f5e682f4bada56ece1e4b8b0b11dba3f5d3

Merge "logcat: add 'kernel' to defaults"

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 15e07fe..6e38d95 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -483,7 +483,8 @@
                     "                  Additionally, 'kernel' for userdebug and eng builds, and\n"
                     "                  'security' for Device Owner installations.\n"
                     "                  Multiple -b parameters or comma separated list of buffers are\n"
-                    "                  allowed. Buffers interleaved. Default -b main,system,crash.\n"
+                    "                  allowed. Buffers interleaved.\n"
+                    "                  Default -b main,system,crash,kernel.\n"
                     "  -B, --binary    Output the log in binary.\n"
                     "  -S, --statistics                       Output statistics.\n"
                     "  -p, --prune     Print prune white and ~black list. Service is specified as\n"
@@ -1312,6 +1313,10 @@
             dev = dev->next = new log_device_t("crash", false);
             context->devCount++;
         }
+        if (android_name_to_log_id("kernel") == LOG_ID_KERNEL) {
+            dev = dev->next = new log_device_t("kernel", false);
+            context->devCount++;
+        }
     }
 
     if (!!context->logRotateSizeKBytes && !context->outputFileName) {