commit ebf4878b2c504972a396a659b70a9c72eb8be58a
author Mark Salyzyn <salyzyn@google.com> Thu Dec 10 15:43:24 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 15:43:24 2015 -0800
tree 59b5272a0cc100bef9d7269b5b9062bd5afc898b
parent 25ea62765d5e5779d1c3a8c46a4155b329eb4c60
parent a5c12ffa8b9ff60d97783180dbbbc0d3108b4d56

Merge "logd: logd-reinit exits with 194" am: c172d9e204
am: 7aa44977b5

* commit '7aa44977b5dbed8bc1eb1376159cbe11524466b9':
  logd: logd-reinit exits with 194

logd/main.cpp

diff --git a/logd/main.cpp b/logd/main.cpp
index 8e75b37..0f55d60 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -349,7 +349,7 @@
         memset(&p, 0, sizeof(p));
         p.fd = sock;
         p.events = POLLIN;
-        ret = TEMP_FAILURE_RETRY(poll(&p, 1, 100));
+        ret = TEMP_FAILURE_RETRY(poll(&p, 1, 1000));
         if (ret < 0) {
             return -errno;
         }