commit abd47fe4c03f6c827d604e11a66df59a59536c02
author Jayachandran Chinnakkannu <jayachandranc@google.com> Fri Aug 16 09:53:06 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 16 09:53:06 2019 -0700
tree c1abb5def2b90372a9b7261b5d023efac94af134
parent 674dc9946ade1f8d7c7677ef38004769cb1ef1b7
parent 6c1fbfa043d82a37733a97659e02db3007524849

Merge "Dump HALs and enable persistent logs for radio bugreports" am: 49eea1e7c9
am: 6c1fbfa043

Change-Id: Ib0f7d6c93dfbb34cbaf5200a71cad8b33960ea4e

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 288fa07..60ddeac 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1547,6 +1547,8 @@
 static void DumpstateRadioCommon() {
     DumpIpTablesAsRoot();
 
+    ds.AddDir(LOGPERSIST_DATA_DIR, false);
+
     if (!DropRootUser()) {
         return;
     }
@@ -1557,6 +1559,7 @@
     DoKmsg();
     DumpIpAddrAndRules();
     dump_route_tables();
+    DumpHals();
 
     RunDumpsys("NETWORK DIAGNOSTICS", {"connectivity", "--diag"},
                CommandOptions::WithTimeout(10).Build());
@@ -1626,8 +1629,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");