| commit | b25e8b6a0d36edd1e05385340726cb680b034156 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 13 20:42:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 13 20:42:58 2023 +0000 |
| tree | 1055af1cff5a58d03f78d8f0164190f3f51d24a0 | |
| parent | d90fb50b6be17eaeffb95782e74ae07b658a1b43 [diff] | |
| parent | 97a1411352f848f4cf51f4631322417da5d04a60 [diff] |
Merge "binderRpcTest: allow unsupported vsock family" am: eeaff65a18 am: 97a1411352 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2531817 Change-Id: I993ffe6ef369ffe3d538679d8353ebd86652b5c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp index 504b3ce..8d13007 100644 --- a/libs/binder/tests/binderRpcTest.cpp +++ b/libs/binder/tests/binderRpcTest.cpp
@@ -1126,6 +1126,11 @@ 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{