commit 49eea1e7c97b57a526049e57d22cb51b5701e08b
author Jayachandran Chinnakkannu <jayachandranc@google.com> Fri Aug 16 16:29:33 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 16 16:29:33 2019 +0000
tree b74e2adef22aecb48b416cb9f85416d167e2dd21
parent 8385d699c9c237b7003b936ffc8c17cf9e3d3e09
parent 6996827fa06e9c83324da4da485251a78b081da2

Merge "Dump HALs and enable persistent logs for radio bugreports"

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 0b9dada..52cd831 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1510,6 +1510,8 @@
 static void DumpstateRadioCommon() {
     DumpIpTablesAsRoot();
 
+    ds.AddDir(LOGPERSIST_DATA_DIR, false);
+
     if (!DropRootUser()) {
         return;
     }
@@ -1520,6 +1522,7 @@
     DoKmsg();
     DumpIpAddrAndRules();
     dump_route_tables();
+    DumpHals();
 
     RunDumpsys("NETWORK DIAGNOSTICS", {"connectivity", "--diag"},
                CommandOptions::WithTimeout(10).Build());
@@ -1589,8 +1592,6 @@
     RunDumpsys("DUMPSYS", {"wifi"}, CommandOptions::WithTimeout(90).Build(),
                SEC_TO_MSEC(10));
 
-    DumpHals();
-
     printf("========================================================\n");
     printf("== dumpstate: done (id %d)\n", ds.id_);
     printf("========================================================\n");