Merge "Handled failure of execvp and increases am timeout." into nyc-dev

1 files changed, 3 insertions, 1 deletions

diff --git a/cmds/dumpstate/utils.cpp b/cmds/dumpstate/utils.cpp
index 89c9653e37..d07ca8c37d 100644
--- a/cmds/dumpstate/utils.cpp
+++ b/cmds/dumpstate/utils.cpp
@@ -737,6 +737,8 @@ int run_command_always(const char *title, bool drop_root, int timeout_seconds, c
 
         execvp(command, (char**) args);
         // execvp's result will be handled after waitpid_with_timeout() below...
+        MYLOGD("execvp on command %s (plus args) returned control; calling _exit(-1)", command)
+        _exit(-1); // ...but it doesn't hurt to force exit, just in case
     }
 
     /* handle parent case */
@@ -848,7 +850,7 @@ void send_broadcast(const std::string& action, const std::vector<std::string>& a
     std::string args_string;
     format_args(am_index + 1, am_args, &args_string);
     MYLOGD("send_broadcast command: %s\n", args_string.c_str());
-    run_command_always(NULL, 5, true, am_args);
+    run_command_always(NULL, 20, true, am_args);
 }
 
 size_t num_props = 0;