commit 652cc80fcffda5a80b468b822cdddd69b28696a3
author Vishnu Nair <vishnun@google.com> Thu Nov 30 15:18:30 2017 -0800
committer Vishnu Nair <vishnun@google.com> Thu Nov 30 15:18:30 2017 -0800
tree 6dda2acd1f7be5b5f2e2c1c862e8c78615896d42
parent 5b4cffc352f7f5d3711d4b7798a07434a998b2d7

Fix dumpsys timeout regression

Bug: 69974956
Test: adb bugreport ~/tmp.zip
Change-Id: I833937de55c780773d946ef36a5105e544940bfa

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index aba08d9..4b67d8f 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1085,7 +1085,7 @@
                    CommandOptions::WithTimeout(90).DropRoot().Build());
     } else {
         RunDumpsys("DUMPSYS", {"--skip", "meminfo", "cpuinfo"},
-                   CommandOptions::WithTimeout(90).Build(), 10);
+                   CommandOptions::WithTimeout(90).Build(), SEC_TO_MSEC(10));
     }
 }
 
@@ -1307,8 +1307,10 @@
     printf("== Android Framework Services\n");
     printf("========================================================\n");
 
-    RunDumpsys("DUMPSYS", {"connectivity"}, CommandOptions::WithTimeout(90).Build(), 10);
-    RunDumpsys("DUMPSYS", {"carrier_config"}, CommandOptions::WithTimeout(90).Build(), 10);
+    RunDumpsys("DUMPSYS", {"connectivity"}, CommandOptions::WithTimeout(90).Build(),
+               SEC_TO_MSEC(10));
+    RunDumpsys("DUMPSYS", {"carrier_config"}, CommandOptions::WithTimeout(90).Build(),
+               SEC_TO_MSEC(10));
 
     printf("========================================================\n");
     printf("== Running Application Services\n");