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

Commit 3c57b7f3 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "logcat: add 'kernel' to defaults" 

am: c7fe1552

Change-Id: I34b95bbe4f2beba571b43c1c5785ac94842e49af
parents 401cc575 c7fe1552

logcat/logcat.cpp

+6 −1
Original line number Diff line number Diff line
@@ -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) {