commit f625a249b9a0de54eedf3fa0aaa549c1fb568298
author Christopher Ferris <cferris@google.com> Thu Oct 02 01:16:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 02 01:16:58 2014 +0000
tree 5e0f8293b1433e27c1e294dff9257d5effa530a8
parent 20daf003aaf1f01d5ef3cd60306db3cff89512c8
parent a91968fd099378d1673c7443be16adcb97ee40af

am a91968fd: Merge "Accept socket connection before tracing." into lmp-dev

* commit 'a91968fd099378d1673c7443be16adcb97ee40af':
  Accept socket connection before tracing.

cmds/dumpstate/dumpstate.c

diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index f142095..1fbcef6 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -438,6 +438,12 @@
         }
     }
 
+    // If we are going to use a socket, do it as early as possible
+    // to avoid timeouts from bugreport.
+    if (use_socket) {
+        redirect_to_socket(stdout, "dumpstate");
+    }
+
     /* open the vibrator before dropping root */
     FILE *vibrator = 0;
     if (do_vibrate) {
@@ -504,9 +510,7 @@
     char path[PATH_MAX], tmp_path[PATH_MAX];
     pid_t gzip_pid = -1;
 
-    if (use_socket) {
-        redirect_to_socket(stdout, "dumpstate");
-    } else if (use_outfile) {
+    if (!use_socket && use_outfile) {
         strlcpy(path, use_outfile, sizeof(path));
         if (do_add_date) {
             char date[80];