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

Commit 11273bc5 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by android-build-merger
Browse files

Merge "Use ro.logd.kernel for kernel logcat" am: d443dd32 

am: 66d9c4aa

Change-Id: Ieb7beb5d7a263c0b58ca77967ac9ce01720de841
parents 2393133e 66d9c4aa

logd/README.property

+3 −3
Original line number Original line Diff line number Diff line
@@ -31,9 +31,9 @@ ro.logd.size number svelte default for persist.logd.size. Larger 
                                         resist increasing the log buffer.

                                         resist increasing the log buffer.

persist.logd.size.<buffer> number  ro    Size of the buffer for <buffer> log

persist.logd.size.<buffer> number  ro    Size of the buffer for <buffer> log

ro.logd.size.<buffer>      number svelte default for persist.logd.size.<buffer>

ro.logd.size.<buffer>      number svelte default for persist.logd.size.<buffer>

ro.config.low_ram          bool   false  if true, logd.statistics, logd.kernel

ro.config.low_ram          bool   false  if true, logd.statistics,

                                         default false, logd.size 64K instead

                                         ro.logd.kernel default false,

                                         of 256K.

                                         logd.size 64K instead of 256K.

persist.logd.filter        string        Pruning filter to optimize content.

persist.logd.filter        string        Pruning filter to optimize content.

                                         At runtime use: logcat -P "<string>"

                                         At runtime use: logcat -P "<string>"

ro.logd.filter       string "~! ~1000/!" default for persist.logd.filter.

ro.logd.filter       string "~! ~1000/!" default for persist.logd.filter.

logd/main.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -438,8 +438,8 @@ int main(int argc, char* argv[]) { 




    int fdPmesg = -1;

    int fdPmesg = -1;

    bool klogd = __android_logger_property_get_bool(

    bool klogd = __android_logger_property_get_bool(

        "logd.kernel", BOOL_DEFAULT_TRUE | BOOL_DEFAULT_FLAG_PERSIST |

        "ro.logd.kernel",

                           BOOL_DEFAULT_FLAG_ENG | BOOL_DEFAULT_FLAG_SVELTE);

        BOOL_DEFAULT_TRUE | BOOL_DEFAULT_FLAG_ENG | BOOL_DEFAULT_FLAG_SVELTE);

    if (klogd) {

    if (klogd) {

        static const char proc_kmsg[] = "/proc/kmsg";

        static const char proc_kmsg[] = "/proc/kmsg";

        fdPmesg = android_get_control_file(proc_kmsg);

        fdPmesg = android_get_control_file(proc_kmsg);