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

Commit 32901861 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Dumpstate: Add Bluetooth logs after getting Bluetooth dumpsys" am: f24c81b3 am: 7358ada5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1595619

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46edb8e90eb0309bcc2fc227f2dfc29f1b511b41
parents 5886c71b 7358ada5

cmds/dumpstate/dumpstate.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -1656,8 +1656,6 @@ static Dumpstate::RunStatus dumpstate() { 
    for_each_tid(show_wchan, "BLOCKED PROCESS WAIT-CHANNELS");

    for_each_tid(show_wchan, "BLOCKED PROCESS WAIT-CHANNELS");

    for_each_pid(show_showtime, "PROCESS TIMES (pid cmd user system iowait+percentage)");

    for_each_pid(show_showtime, "PROCESS TIMES (pid cmd user system iowait+percentage)");





    /* Dump Bluetooth HCI logs */

    ds.AddDir("/data/misc/bluetooth/logs", true);

    /* Dump Nfc NCI logs */

    /* Dump Nfc NCI logs */

    ds.AddDir("/data/misc/nfc/logs", true);

    ds.AddDir("/data/misc/nfc/logs", true);
@@ -1743,6 +1741,9 @@ static Dumpstate::RunStatus dumpstate() { 




    RUN_SLOW_FUNCTION_WITH_CONSENT_CHECK(RunDumpsysNormal);

    RUN_SLOW_FUNCTION_WITH_CONSENT_CHECK(RunDumpsysNormal);





    /* Dump Bluetooth HCI logs after getting bluetooth_manager dumpsys */

    ds.AddDir("/data/misc/bluetooth/logs", true);



    if (ds.dump_pool_) {

    if (ds.dump_pool_) {

        WAIT_TASK_WITH_CONSENT_CHECK(DUMP_CHECKINS_TASK, ds.dump_pool_);

        WAIT_TASK_WITH_CONSENT_CHECK(DUMP_CHECKINS_TASK, ds.dump_pool_);

    } else {

    } else {