From 88aa8c3c7a97fda3a3fb200d9c71323844f97617 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Wed, 1 Nov 2023 09:46:07 -0700 Subject: Don't depend on libbase result.h Test: mma Bug: 302723053 Change-Id: Iea797d6af825d58543ba899f6e712b27e48d859a --- libs/binder/RpcSession.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libs/binder/RpcSession.cpp') diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp index 7e181941a9..70382c0722 100644 --- a/libs/binder/RpcSession.cpp +++ b/libs/binder/RpcSession.cpp @@ -192,10 +192,7 @@ status_t RpcSession::setupPreconnectedClient(base::unique_fd fd, 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); -- cgit v1.2.3-59-g8ed1b