ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "logcat: add 'kernel' to defaults"

Browse source
This commit is contained in:
Treehugger Robot 2019-07-09 02:09:31 +00:00 • committed by Gerrit Code Review
commit c7fe1552d5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
logcat/logcat.cpp
View file

@ -483,7 +483,8 @@ static void show_help(android_logcat_context_internal* context) {
" 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 @@ static int __logcat(android_logcat_context_internal* context) {
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) {