commit 4c43b1572eec1a8d652034e6260b502292c9d8e1
author Steven Moreland <smoreland@google.com> Mon Aug 09 18:54:54 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 09 18:54:54 2021 +0000
tree 04014d59e730bbf383b7f9856239e1fae33158b3
parent 913c6ce9d70bd595d5e7dc68ca9fe8454d372abe
parent 43f81cefc664a2e5a5358a928748d97a4bb7af4c

Merge "binderRpcTest: work when vsock not supported" am: bf5fdedf6f am: 81809face4 am: 43f81cefc6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1788713

Change-Id: Ifff987fb2ac358af3becd0734266fdd1d144c226

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