commit 2b80db95b797a6228ab02da2b5deb3a6d5e3f099
author Tom Cherry <tomcherry@google.com> Tue Oct 08 12:55:34 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 08 12:55:34 2019 -0700
tree f2ab6aa3842007d7a0200b93ca4263aea28a2f0b
parent dd720179cb95882e8e07fb2a7d00b3b981ad07a9
parent 6711a620b7e9856141b1f28b7e82ff0720364ca7

Merge "liblog: remove code checking for fd = 0" am: 5d7969b58a am: 036b7c2998 am: 5cd4c6dc11
am: b15d53fbf7

Change-Id: If8a699fc590860eefd731a6f07ac8dd6aba13453

liblog/logd_reader.cpp

diff --git a/liblog/logd_reader.cpp b/liblog/logd_reader.cpp
index d7f2975..dcdff05 100644
--- a/liblog/logd_reader.cpp
+++ b/liblog/logd_reader.cpp
@@ -107,7 +107,7 @@
   strlcpy(addr.sun_path, path.c_str(), sizeof(addr.sun_path));
 
   int fd = socket(AF_LOCAL, type | SOCK_CLOEXEC, 0);
-  if (fd == 0) {
+  if (fd == -1) {
     return -1;
   }
 
@@ -337,12 +337,6 @@
   }
 
   sock = socket_local_client("logdr", SOCK_SEQPACKET);
-  if (sock == 0) {
-    /* Guarantee not file descriptor zero */
-    int newsock = socket_local_client("logdr", SOCK_SEQPACKET);
-    close(sock);
-    sock = newsock;
-  }
   if (sock <= 0) {
     if ((sock == -1) && errno) {
       return -errno;