commit 1eab345becf85e7d9c6e56fd30924d1e3d8590a8
author Steven Moreland <smoreland@google.com> Thu Aug 05 16:56:20 2021 -0700
committer Steven Moreland <smoreland@google.com> Fri Aug 06 18:19:59 2021 +0000
tree 094c146331e8b2c17cffb21f9bc61a9b3249a7cf
parent 2372f9d850837de10d19453088cb32f1939e46dc

binderRpcTest: work when vsock not supported

If vsock isn't supported at all, don't abort.

Bug: 167966510
Test: binderRpcTest (on Pixel 3)
Change-Id: I3384349eb63dea99aa8f3f0f91a8719e0f85a76a

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 6dd4019..15ccae9 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -1196,7 +1196,12 @@
     unsigned int vsockPort = allocateVsockPort();
     sp<RpcServer> server = RpcServer::make(RpcTransportCtxFactoryRaw::make());
     server->iUnderstandThisCodeIsExperimentalAndIWillNotUseItInProduction();
-    CHECK_EQ(OK, server->setupVsockServer(vsockPort));
+    if (status_t status = server->setupVsockServer(vsockPort); status != OK) {
+        if (status == -EAFNOSUPPORT) {
+            return false;
+        }
+        LOG_ALWAYS_FATAL("Could not setup vsock server: %s", statusToString(status).c_str());
+    }
     server->start();
 
     sp<RpcSession> session = RpcSession::make(RpcTransportCtxFactoryRaw::make());