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

Commit 91ff2fea authored by Jack He's avatar Jack He
Browse files

Dumpstate: Add Bluetooth logs after getting Bluetooth dumpsys 

* Getting Bluetooth dumpsys after getting the log files will result
  in a small gap period where no packet log is available when they
  should be
* Moreover, bluetooth dumpsys dump some binary formated log into log
  file and hence the file needs to be included after the dumpsys

Bug: 180569201
Test: take bugreport
Change-Id: Ibf3fe24d3c07df5858d355d52c2082aea38a8447
parent cc567d02

cmds/dumpstate/dumpstate.cpp

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

    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 */

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


    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_) {

        WAIT_TASK_WITH_CONSENT_CHECK(DUMP_CHECKINS_TASK, ds.dump_pool_);

    } else {