summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJayachandran Chinnakkannu <jayachandranc@google.com>2019-08-14 19:32:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-14 19:32:48 +0000
commit0c5f26bab85bbacaa87b33692bcc29a3c1dea021 (patch)
treeea75d56af8c6c0cb33be5a09174da2f1504e1a24
parent9939d091ec7da4436ce247699c6781075e840af2 (diff)
parentb4389d9b481e9d869ee46fd23d4d098090e7d8f4 (diff)
downloadnative-0c5f26bab85bbacaa87b33692bcc29a3c1dea021.tar.gz
Merge "Dump HALs and enable persistent logs for radio bugreports" into qt-r1-dev
-rw-r--r--cmds/dumpstate/dumpstate.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 4ac7b689cf..5de40776b9 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1594,6 +1594,8 @@ static Dumpstate::RunStatus DumpstateDefault() {
static void DumpstateRadioCommon() {
DumpIpTablesAsRoot();
+ ds.AddDir(LOGPERSIST_DATA_DIR, false);
+
if (!DropRootUser()) {
return;
}
@@ -1604,6 +1606,7 @@ static void DumpstateRadioCommon() {
DoKmsg();
DumpIpAddrAndRules();
dump_route_tables();
+ DumpHals();
RunDumpsys("NETWORK DIAGNOSTICS", {"connectivity", "--diag"},
CommandOptions::WithTimeout(10).Build());
@@ -1673,8 +1676,6 @@ static void DumpstateWifiOnly() {
RunDumpsys("DUMPSYS", {"wifi"}, CommandOptions::WithTimeout(90).Build(),
SEC_TO_MSEC(10));
- DumpHals();
-
printf("========================================================\n");
printf("== dumpstate: done (id %d)\n", ds.id_);
printf("========================================================\n");