commit 91ff2fea32d91701a63c1fe5340b8aa73a59f5b1
author Jack He <siyuanh@google.com> Thu Feb 18 18:23:43 2021 -0800
committer Jack He <siyuanh@google.com> Tue Feb 23 21:06:14 2021 +0000
tree cbe2d9c5816771cb8d37312f664638a3deff4ac0
parent cc567d0228a9edab5ab79f37610acd8c5de7a7a6

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

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 9e73dcc..528feca 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1656,8 +1656,6 @@
     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 @@
 
     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 {