commit 88aa8c3c7a97fda3a3fb200d9c71323844f97617
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Nov 01 09:46:07 2023 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Fri Nov 03 21:05:51 2023 -0700
tree ac842d6ed827d67e9d198ca830c9dd6f9f31f5f3
parent 1d1f7ac538473bc368a5358c9fb9f4d8c25ad142

Don't depend on libbase result.h

Test: mma
Bug: 302723053
Change-Id: Iea797d6af825d58543ba899f6e712b27e48d859a

libs/binder/RpcSession.cpp

diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index 7e18194..70382c0 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -192,10 +192,7 @@
             fd = request();
             if (!fd.ok()) return BAD_VALUE;
         }
-        if (auto res = binder::os::setNonBlocking(fd); !res.ok()) {
-            ALOGE("setupPreconnectedClient: %s", res.error().message().c_str());
-            return res.error().code() == 0 ? UNKNOWN_ERROR : -res.error().code();
-        }
+        if (status_t res = binder::os::setNonBlocking(fd); res != OK) return res;
 
         RpcTransportFd transportFd(std::move(fd));
         status_t status = initAndAddConnection(std::move(transportFd), sessionId, incoming);