commit f2d0b7ee5048c7871b44079b75cc2c238a86f137
author Tom Cherry <tomcherry@google.com> Tue Oct 08 12:37:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 08 12:37:01 2019 -0700
tree d6e2336399a3dc1c966fda597cd4a450aacb14e8
parent 7d377749d5c3d98708a3b3c2c930a411418250e6
parent 504c1004c28b9bee6d7e8923e59dd081432a641e

Merge "liblog: remove code checking for fd = 0"
am: 5d7969b58a

Change-Id: I240832dbc14fc8ef10f331d80fc84abd8fcfd820

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;