Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f81cef authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "binderRpcTest: work when vsock not supported" am: bf5fdedf am: 81809fac 

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

Change-Id: I80fc4f46dd27cd15766d66f50461d7dc04736abf
parents b79e5aff 81809fac

libs/binder/tests/binderRpcTest.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,12 @@ static bool testSupportVsockLoopback() { 
    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());