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

Commit 9a56b7b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't use libbase macros in binderRpcTest" into main am: dd07deae 

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



Change-Id: Id4738b311c6b07521a613eeb99508ab89a03d241
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53df4587 dd07deae

libs/binder/tests/binderRpcTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <trusty/tipc.h>

#endif // BINDER_RPC_TO_TRUSTY_TEST



#include "../Utils.h"

#include "binderRpcTestCommon.h"

#include "binderRpcTestFixture.h"
@@ -1197,7 +1198,7 @@ bool testSupportVsockLoopback() { 
                    {.fd = serverFd.get(), .events = POLLIN, .revents = 0},

                    {.fd = connectFd.get(), .events = POLLOUT, .revents = 0},

            };

            ret = TEMP_FAILURE_RETRY(poll(pfd, arraysize(pfd), -1));

            ret = TEMP_FAILURE_RETRY(poll(pfd, countof(pfd), -1));

            LOG_ALWAYS_FATAL_IF(ret < 0, "Error polling: %s", strerror(errno));



            if (pfd[0].revents & POLLIN) {