summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-10-06 19:57:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-06 19:57:08 +0000
commit40d3843f96c7b6ea34e881f22860beb5e09c07ca (patch)
tree10ce6117e78a24dcaae651542309035dc9a24973
parentbc2486e12446e24a2422eb889dae409ff44cc322 (diff)
parent94dbcdfd6864416777aa2f6f57832632da175bd0 (diff)
Merge "dumpstate: more time for non-zipping lshal debug" am: 84ea3dee04 am: 94dbcdfd68
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1435054 Change-Id: Iea2aec779b046e4705d32ae85a15dcf5ca55dbab
-rw-r--r--cmds/dumpstate/dumpstate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index af41643d5d..edad3fdebf 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1308,7 +1308,7 @@ static Dumpstate::RunStatus RunDumpsysNormal() {
static void DumpHals() {
if (!ds.IsZipping()) {
RunCommand("HARDWARE HALS", {"lshal", "--all", "--types=all", "--debug"},
- CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());
+ CommandOptions::WithTimeout(60).AsRootIfAvailable().Build());
return;
}
DurationReporter duration_reporter("DUMP HALS");