commit 575149f8f04136759e34d298966dd5e9a84b1cde
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Aug 17 07:07:19 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 17 07:07:19 2019 +0000
tree b7ae1f2bc68a285f89f0d1f26bd8b87fe16e06ff
parent 0c5f26bab85bbacaa87b33692bcc29a3c1dea021
parent 63edd27c0843a7c9b4268b86c3b991d78607f888

Merge "Remove test image" into qt-r1-dev

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 4ac7b68..5de4077 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1594,6 +1594,8 @@
 static void DumpstateRadioCommon() {
     DumpIpTablesAsRoot();
 
+    ds.AddDir(LOGPERSIST_DATA_DIR, false);
+
     if (!DropRootUser()) {
         return;
     }
@@ -1604,6 +1606,7 @@
     DoKmsg();
     DumpIpAddrAndRules();
     dump_route_tables();
+    DumpHals();
 
     RunDumpsys("NETWORK DIAGNOSTICS", {"connectivity", "--diag"},
                CommandOptions::WithTimeout(10).Build());
@@ -1673,8 +1676,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");