summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJayachandran Chinnakkannu <jayachandranc@google.com>2019-08-16 09:44:05 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-16 09:44:05 -0700
commit6c1fbfa043d82a37733a97659e02db3007524849 (patch)
tree04a94b889b509462ce8acbc846ff1e329e3b81b6
parent2a14748888e7f709be6ba2112ab36a7acd582e9b (diff)
parent49eea1e7c97b57a526049e57d22cb51b5701e08b (diff)
downloadnative-6c1fbfa043d82a37733a97659e02db3007524849.tar.gz
Merge "Dump HALs and enable persistent logs for radio bugreports"
am: 49eea1e7c9 Change-Id: I638bf35bfab7abbc33be58f76edf8745c7177ce4
-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 288fa0741d..60ddeacf70 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1547,6 +1547,8 @@ static Dumpstate::RunStatus DumpstateDefault() {
static void DumpstateRadioCommon() {
DumpIpTablesAsRoot();
+ ds.AddDir(LOGPERSIST_DATA_DIR, false);
+
if (!DropRootUser()) {
return;
}
@@ -1557,6 +1559,7 @@ static void DumpstateRadioCommon() {
DoKmsg();
DumpIpAddrAndRules();
dump_route_tables();
+ DumpHals();
RunDumpsys("NETWORK DIAGNOSTICS", {"connectivity", "--diag"},
CommandOptions::WithTimeout(10).Build());
@@ -1626,8 +1629,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");