dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)

am: 03d61d95fa

* commit '03d61d95fa6a321bf26548b320a1a9c8dc78e124':
  dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)

diff --cc cmds/dumpstate/dumpstate.c
index 6093e08,a2e4f4b..af0bbee
--- 1/cmds/dumpstate/dumpstate.c
--- 2/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@@ -334,31 -336,20 +336,31 @@@ static void dumpstate() 
      // dump_file("EVENT LOG TAGS", "/etc/event-log-tags");
      // calculate timeout
      timeout = logcat_timeout("main") + logcat_timeout("system") + logcat_timeout("crash");
-     if (timeout < 20000) {
-         timeout = 20000;
+     if (timeout < logcat_min_timeout) {
+         timeout = logcat_min_timeout;
      }
 -    run_command("SYSTEM LOG", timeout / 1000, "logcat", "-v", "threadtime", "-d", "*:v", NULL);
 +    run_command("SYSTEM LOG", timeout / 1000, "logcat", "-v", "threadtime",
 +                                                        "-v", "printable",
 +                                                        "-d",
 +                                                        "*:v", NULL);
      timeout = logcat_timeout("events");
-     if (timeout < 20000) {
-         timeout = 20000;
+     if (timeout < logcat_min_timeout) {
+         timeout = logcat_min_timeout;
      }
 -    run_command("EVENT LOG", timeout / 1000, "logcat", "-b", "events", "-v", "threadtime", "-d", "*:v", NULL);
 +    run_command("EVENT LOG", timeout / 1000, "logcat", "-b", "events",
 +                                                       "-v", "threadtime",
 +                                                       "-v", "printable",
 +                                                       "-d",
 +                                                       "*:v", NULL);
      timeout = logcat_timeout("radio");
-     if (timeout < 20000) {
-         timeout = 20000;
+     if (timeout < logcat_min_timeout) {
+         timeout = logcat_min_timeout;
      }
 -    run_command("RADIO LOG", timeout / 1000, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL);
 +    run_command("RADIO LOG", timeout / 1000, "logcat", "-b", "radio",
 +                                                       "-v", "threadtime",
 +                                                       "-v", "printable",
 +                                                       "-d",
 +                                                       "*:v", NULL);
  
      run_command("LOG STATISTICS", 10, "logcat", "-b", "all", "-S", NULL);