diff options
| -rw-r--r-- | cmds/bugreportz/main.cpp | 17 | ||||
| -rw-r--r-- | cmds/dumpstate/dumpstate.cpp | 6 |
2 files changed, 1 insertions, 22 deletions
diff --git a/cmds/bugreportz/main.cpp b/cmds/bugreportz/main.cpp index 790556ce5a..cd2652c717 100644 --- a/cmds/bugreportz/main.cpp +++ b/cmds/bugreportz/main.cpp @@ -75,23 +75,6 @@ int main(int argc, char* argv[]) { return EXIT_FAILURE; } - // Wait a little while for dumpstatez to stop if it is running - bool dumpstate_running = false; - for (int i = 0; i < 20; i++) { - char buf[PROPERTY_VALUE_MAX]; - property_get("init.svc.dumpstatez", buf, ""); - dumpstate_running = strcmp(buf, "running") == 0; - - if (!dumpstate_running) break; - - sleep(1); - } - - if (dumpstate_running) { - fprintf(stderr, "FAIL:dumpstatez service is already running\n"); - return EXIT_FAILURE; - } - // TODO: code below was copy-and-pasted from bugreport.cpp (except by the // timeout value); // should be reused instead. diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp index ed1885b5fa..8a337569c4 100644 --- a/cmds/dumpstate/dumpstate.cpp +++ b/cmds/dumpstate/dumpstate.cpp @@ -2602,11 +2602,7 @@ static void ShowUsage() { } static void register_sig_handler() { - signal(SIGPIPE, [](int) { - MYLOGE("Connection with client lost, canceling."); - ds.Cancel(); - abort(); - }); + signal(SIGPIPE, SIG_IGN); } bool Dumpstate::FinishZipFile() { |