| commit | 88cf4b21ae06941755839a15fb93a83d7738c7e8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue May 11 07:30:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 11 07:30:52 2021 +0000 |
| tree | 91078516c4d9ed8e1f04ad1c724b6cf726f18707 | |
| parent | 2be90250ffc66eaaac0591551ad4e68b4af8044d [diff] | |
| parent | 279589cbc31700cad9c0c6ae052c0788d6e10187 [diff] |
Merge "0->nullptr." am: 279589cbc3 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1700334 Change-Id: Idf4699a236a2dc0c6fd4f65b24876b262863dd27
diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp index aaebb23..e9186f0 100644 --- a/libs/binder/RpcServer.cpp +++ b/libs/binder/RpcServer.cpp
@@ -129,8 +129,8 @@ } 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));