commit 17ea0116db02bd93a24ea84073e87ef2b2aec3f5
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 14 22:30:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 14 22:30:36 2018 +0000
tree daed2132a13a0417a3e8b3e2cf36a6b3eece25a5
parent 8263b0d17d478ad2950085a807633191190a7cdb
parent 371bf907fe24c01a03f526b15ead08f7261350ce

Merge "Rearm pdx fd on errors" into pi-dev

libs/vr/libpdx_uds/service_endpoint.cpp

diff --git a/libs/vr/libpdx_uds/service_endpoint.cpp b/libs/vr/libpdx_uds/service_endpoint.cpp
index 0ee77f4..32d40e8 100644
--- a/libs/vr/libpdx_uds/service_endpoint.cpp
+++ b/libs/vr/libpdx_uds/service_endpoint.cpp
@@ -594,9 +594,10 @@
 
   if (socket_fd_ && event.data.fd == socket_fd_.Get()) {
     auto status = AcceptConnection(message);
-    if (!status)
-      return status;
-    return ReenableEpollEvent(socket_fd_.Borrow());
+    auto reenable_status = ReenableEpollEvent(socket_fd_.Borrow());
+    if (!reenable_status)
+      return reenable_status;
+    return status;
   }
 
   BorrowedHandle channel_fd{event.data.fd};