commit 8828994d05572552da893db4663efd6e1e77948e
author Elliott Hughes <enh@google.com> Wed Feb 26 19:38:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 26 19:38:35 2014 +0000
tree e4a9836f27b27f3f45601a413d2c4f8b17a85b4a
parent f936f66c2abf132dff883f6d31f4cc0b8d20f984
parent 431735f005af79407e01a68995ac6dde7ff4b815

am 431735f0: Merge "libcutils: Socket type might contain bitwise OR flags"

* commit '431735f005af79407e01a68995ac6dde7ff4b815':
  libcutils: Socket type might contain bitwise OR flags

libcutils/socket_local_server.c

diff --git a/libcutils/socket_local_server.c b/libcutils/socket_local_server.c
index 4971b1b..7628fe4 100644
--- a/libcutils/socket_local_server.c
+++ b/libcutils/socket_local_server.c
@@ -43,6 +43,8 @@
 
 #define LISTEN_BACKLOG 4
 
+/* Only the bottom bits are really the socket type; there are flags too. */
+#define SOCK_TYPE_MASK 0xf
 
 /**
  * Binds a pre-created socket(AF_LOCAL) 's' to 'name'
@@ -107,7 +109,7 @@
         return -1;
     }
 
-    if (type == SOCK_STREAM) {
+    if ((type & SOCK_TYPE_MASK) == SOCK_STREAM) {
         int ret;
 
         ret = listen(s, LISTEN_BACKLOG);