diff options
| author | 2021-05-11 17:28:07 +0000 | |
|---|---|---|
| committer | 2021-05-11 17:28:07 +0000 | |
| commit | 9d267542967c55bae268b3684a0949c975c7a65f (patch) | |
| tree | 4292dd7db4d07d5665ce7699798b9928fcfa33a0 /libs | |
| parent | 69cd4db5da2b95859eb73e9322606ca53d1ad9e7 (diff) | |
| parent | d905f07ffdeabc45623b15d5cd5f868471ae1574 (diff) | |
Merge "0->nullptr." am: 279589cbc3 am: 88cf4b21ae am: d905f07ffd
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1700334
Change-Id: If357bddcc79e7060981a4d3e9f9e733f1af23826
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/RpcServer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp index aaebb23f6f..e9186f0e22 100644 --- a/libs/binder/RpcServer.cpp +++ b/libs/binder/RpcServer.cpp @@ -129,8 +129,8 @@ void RpcServer::join() { } while (true) { - unique_fd clientFd( - TEMP_FAILURE_RETRY(accept4(mServer.get(), nullptr, 0 /*length*/, SOCK_CLOEXEC))); + unique_fd clientFd(TEMP_FAILURE_RETRY( + accept4(mServer.get(), nullptr, nullptr /*length*/, SOCK_CLOEXEC))); if (clientFd < 0) { ALOGE("Could not accept4 socket: %s", strerror(errno)); |