commit bf5fdedf6f49c5dce1725699484b5a1a26761573
author Steven Moreland <smoreland@google.com> Mon Aug 09 18:11:01 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 09 18:11:01 2021 +0000
tree edd7e11a750350df35ec1dedadd38d1a3d7d4c7f
parent bd8ea28f863777fc5cd9a2ff068801135e2b0e2c
parent 1eab345becf85e7d9c6e56fd30924d1e3d8590a8

Merge "binderRpcTest: work when vsock not supported"

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());