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

Commit 49ac5525 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "binderRpcTest: allow unsupported vsock family" am: eeaff65a am: 97a14113 am: b25e8b6a 

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



Change-Id: I90a51779b321bcdec36ab9b632a3b1f9ff36f81d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d089da14 b25e8b6a

libs/binder/tests/binderRpcTest.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,11 @@ static bool testSupportVsockLoopback() { 


    android::base::unique_fd serverFd(

            TEMP_FAILURE_RETRY(socket(AF_VSOCK, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)));



    if (errno == EAFNOSUPPORT) {

        return false;

    }



    LOG_ALWAYS_FATAL_IF(serverFd == -1, "Could not create socket: %s", strerror(errno));



    sockaddr_vm serverAddr{