commit 6dec5f4167388fa3d648648f225c8a2b2c3c5d9d
author Jayachandran Chinnakkannu <jayachandranc@google.com> Wed Aug 14 13:26:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 14 13:26:55 2019 -0700
tree 6fbf42e7ed91154684de189b56b66d4e7c7ddc8e
parent c6c7935ebaa0a85138956bfdfc0f18e9105c1f92
parent 0c5f26bab85bbacaa87b33692bcc29a3c1dea021

Merge "Dump HALs and enable persistent logs for radio bugreports" into qt-r1-dev
am: 0c5f26bab8

Change-Id: I52bc4cf2165279ff63833bd78ccd61350e06c328

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index af9ce78..da60036 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1546,6 +1546,8 @@
 static void DumpstateRadioCommon() {
     DumpIpTablesAsRoot();
 
+    ds.AddDir(LOGPERSIST_DATA_DIR, false);
+
     if (!DropRootUser()) {
         return;
     }
@@ -1556,6 +1558,7 @@
     DoKmsg();
     DumpIpAddrAndRules();
     dump_route_tables();
+    DumpHals();
 
     RunDumpsys("NETWORK DIAGNOSTICS", {"connectivity", "--diag"},
                CommandOptions::WithTimeout(10).Build());
@@ -1625,8 +1628,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");